From 6a6c4d48dad5b88492374495e9e1051daf50ddcf Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 25 Aug 2020 04:26:24 +0200 Subject: [PATCH] Update build.sh (#710) Fixe #437 and not reinstall libs if you have installed libs --- build.sh | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/build.sh b/build.sh index 809f5f06..e767367b 100755 --- a/build.sh +++ b/build.sh @@ -4,7 +4,7 @@ # Author: liberodark # License: GNU GPLv3 -version="0.0.7" +version="0.0.8" go_version="1.13.4" echo "OpenDiablo 2 Build Script $version" @@ -14,6 +14,7 @@ echo "OpenDiablo 2 Build Script $version" export PATH=$PATH:/usr/local/go/bin distribution=$(cat /etc/*release | grep "PRETTY_NAME" | sed 's/PRETTY_NAME=//g' | sed 's/["]//g' | awk '{print $1}') +mesa_detect_arch=$(pacman -Q | grep mesa) go_install(){ @@ -27,7 +28,7 @@ go_install(){ if [ "$distribution" = "CentOS" ] || [ "$distribution" = "Red\ Hat" ] || [ "$distribution" = "Oracle" ]; then echo "Downloading Go" - wget https://dl.google.com/go/go"$go_version".linux-amd64.tar.gz > /dev/null 2>&1 + wget https://dl.google.com/go/go"$go_version".linux-amd64.tar.gz > /dev/null 2>&1 echo "Install Go" sudo tar -C /usr/local -xzf go*.linux-amd64.tar.gz > /dev/null 2>&1 echo "Clean unneeded files" @@ -35,7 +36,7 @@ go_install(){ elif [ "$distribution" = "Fedora" ]; then echo "Downloading Go" - wget https://dl.google.com/go/go"$go_version".linux-amd64.tar.gz > /dev/null 2>&1 + wget https://dl.google.com/go/go"$go_version".linux-amd64.tar.gz > /dev/null 2>&1 echo "Install Go" sudo tar -C /usr/local -xzf go*.linux-amd64.tar.gz > /dev/null 2>&1 echo "Clean unneeded files" @@ -43,7 +44,7 @@ go_install(){ elif [ "$distribution" = "Debian" ] || [ "$distribution" = "Ubuntu" ] || [ "$distribution" = "Deepin" ]; then echo "Downloading Go" - wget https://dl.google.com/go/go"$go_version".linux-amd64.tar.gz > /dev/null 2>&1 + wget https://dl.google.com/go/go"$go_version".linux-amd64.tar.gz > /dev/null 2>&1 echo "Install Go" sudo tar -C /usr/local -xzf go*.linux-amd64.tar.gz > /dev/null 2>&1 echo "Clean unneeded files" @@ -57,7 +58,7 @@ go_install(){ elif [ "$distribution" = "OpenSUSE" ] || [ "$distribution" = "SUSE" ]; then echo "Downloading Go" - wget https://dl.google.com/go/go"$go_version".linux-amd64.tar.gz > /dev/null 2>&1 + wget https://dl.google.com/go/go"$go_version".linux-amd64.tar.gz > /dev/null 2>&1 echo "Install Go" sudo tar -C /usr/local -xzf go*.linux-amd64.tar.gz > /dev/null 2>&1 echo "Clean unneeded files" @@ -68,22 +69,27 @@ fi } dep_install(){ - if [ "$distribution" = "CentOS" ] || [ "$distribution" = "Red\ Hat" ] || [ "$distribution" = "Oracle" ]; then - sudo yum install -y libX11-devel libXcursor-devel libXrandr-devel libXinerama-devel mesa-libGL-devel alsa-lib-devel libXi-devel > /dev/null 2>&1 + if [ "$distribution" = "CentOS" ] || [ "$distribution" = "Red\ Hat" ] || [ "$distribution" = "Oracle" ]; then + sudo yum install -y libX11-devel libXcursor-devel libXrandr-devel libXinerama-devel mesa-libGL-devel alsa-lib-devel libXi-devel > /dev/null 2>&1 elif [ "$distribution" = "Fedora" ]; then - sudo dnf install -y libX11-devel libXcursor-devel libXrandr-devel libXinerama-devel mesa-libGL-devel alsa-lib-devel libXi-devel > /dev/null 2>&1 + sudo dnf install -y libX11-devel libXcursor-devel libXrandr-devel libXinerama-devel mesa-libGL-devel alsa-lib-devel libXi-devel > /dev/null 2>&1 elif [ "$distribution" = "Debian" ] || [ "$distribution" = "Ubuntu" ] || [ "$distribution" = "Deepin" ]; then - sudo apt-get install -y libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libgl1-mesa-dev libsdl2-dev libasound2-dev > /dev/null 2>&1 + sudo apt-get install -y libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libgl1-mesa-dev libsdl2-dev libasound2-dev > /dev/null 2>&1 elif [ "$distribution" = "Gentoo" ]; then - sudo emerge --ask n libXcursor libXrandr libXinerama libXi libGLw libglvnd libsdl2 alsa-lib + sudo emerge --ask n libXcursor libXrandr libXinerama libXi libGLw libglvnd libsdl2 alsa-lib > /dev/null 2>&1 elif [ "$distribution" = "Manjaro" ] || [ "$distribution" = "Arch\ Linux" ]; then - sudo pacman -S libxcursor libxrandr libxinerama libxi mesa libglvnd sdl2 sdl2_mixer sdl2_net alsa-lib --noconfirm - - elif [ "$distribution" = "OpenSUSE" ] || [ "$distribution" = "SUSE" ]; then + + if [ -z "$mesa_detect_arch" ]; then + sudo pacman -S libxcursor libxrandr libxinerama libxi mesa libglvnd sdl2 sdl2_mixer sdl2_net alsa-lib --noconfirm > /dev/null 2>&1 + else + sudo pacman -S libxcursor libxrandr libxinerama libxi libglvnd sdl2 sdl2_mixer sdl2_net alsa-lib --noconfirm > /dev/null 2>&1 + fi + + elif [ "$distribution" = "OpenSUSE" ] || [ "$distribution" = "SUSE" ]; then sudo zypper install -y libX11-devel libXcursor-devel libXrandr-devel libXinerama-devel Mesa-libGL-devel alsa-lib-devel libXi-devel > /dev/null 2>&1 fi @@ -93,7 +99,12 @@ dep_install(){ echo "Check Go" go_install echo "Install libraries" +if [ -e "$HOME/.config/OpenDiablo2/.libs" ]; then +echo "libraries is installed" +else +echo "OK" > "$HOME/.config/OpenDiablo2/.libs" dep_install +fi echo "Build OpenDiablo 2" go get -d go build