Przeglądaj źródła

added a bypass for script that do not require this

Daniel Gibbs 11 lat temu
rodzic
commit
5376f1ccfb
1 zmienionych plików z 79 dodań i 75 usunięć
  1. 79 75
      functions/fn_glibcfix

+ 79 - 75
functions/fn_glibcfix

@@ -10,92 +10,96 @@ sleep 1
 echo ""
 }
 
-if [ -z $(command -v ldd) ]; then
-	echo ""
-	echo -e "\r\033[K\e[0;31mFAIL\e[0;39m GLIBC is not detected."
-	sleep 1
-	echo "Install GLIBC and retry installation"
-	sleep 1
-	echo ""
-	while true; do
-		read -p "Continue install? [y/N]" yn
-		case $yn in
-			[Yy]* ) break;;
-			[Nn]* ) echo Exiting; exit;;
-			 * ) echo "Please answer yes or no.";;
-		esac
-	done
-elif [ "$(ldd --version | sed -n '1 p' | tr -cd [:digit:] | tail -c 3)" -lt 215 ]; then
-	echo "GLIBC Fix required"
-	echo "============================"
-	sleep 1
-	echo -e "\e[0;31mWARNING!\e[0;39m ${gamename} requires GLIBC_2.15 or above"
-	sleep 1
-	echo ""
-	echo "Currently installed: GLIBC_$(ldd --version |grep ldd|awk '{print $NF}')"
-	echo "Required: => GLIBC_2.15"
-	echo ""
-	sleep 1
-	echo "The installer will now detect and download the required files to allow ${gamename} server to run on a distro with GLIBC_2.14 or less."
-	echo "note: This will NOT upgrade GLIBC on your system"
-	sleep 1
-	echo ""
-	echo "Downloading Required files"
-	echo "================================="
-	sleep 1
-	if [ "${gamename}" == "Insurgency" ];then
-		fn_glibcfixmsg
-		cd "${filesdir}/bin"
-		wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/Insurgency/dependencies/libc.so.6
-		wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/Insurgency/dependencies/librt.so.1
-		wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/Insurgency/dependencies/libpthread.so.0
+if [ "${gamename}" == "Insurgency" ]||[ "${gamename}" == "Garrys's Mod" ]||[ "${gamename}" == "Natural Selection 2" ]||[ "${gamename}" == "No More Room in Hell" ]||[ "${gamename}" == "Blade Symphony" ]||[ "${gamename}" == "Fistful of Frags" ]||[ "${gamename}" == "ARMA 3" ]; then
+	if [ -z $(command -v ldd) ]; then
+		echo ""
+		echo -e "\r\033[K\e[0;31mFAIL\e[0;39m GLIBC is not detected."
 		sleep 1
-	elif [ "${gamename}" == "Garrys's Mod" ];then
-		fn_glibcfixmsg
-		cd "${filesdir}/bin"
-		wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/GarrysMod/dependencies/libc.so.6
-		wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/GarrysMod/dependencies/libm.so.6
-		wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/GarrysMod/dependencies/libpthread.so.0
-		cp -v "${rootdir}/steamcmd/linux32/libstdc++.so.6" "${filesdir}/libstdc++.so.6"
+		echo "Install GLIBC and retry installation"
 		sleep 1
 		echo ""
-	elif [ "${gamename}" == "Natural Selection 2" ];then
-		fn_glibcfixmsg
-		cd "${filesdir}"
-		wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/NaturalSelection2/dependencies/libm.so.6
-		cp -v "${rootdir}/steamcmd/linux32/libstdc++.so.6" "${filesdir}/libstdc++.so.6"
+		while true; do
+			read -p "Continue install? [y/N]" yn
+			case $yn in
+				[Yy]* ) break;;
+				[Nn]* ) echo Exiting; exit;;
+				 * ) echo "Please answer yes or no.";;
+			esac
+		done
+	elif [ "$(ldd --version | sed -n '1 p' | tr -cd [:digit:] | tail -c 3)" -lt 215 ]; then
+		echo "GLIBC Fix required"
+		echo "============================"
 		sleep 1
-		echo ""
-	elif [ "${gamename}" == "No More Room in Hell" ];then
-		fn_glibcfixmsg
-		cd "${filesdir}"
-		wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/NoMoreRoomInHell/dependencies/libm.so.6
-		cp -v "${rootdir}/steamcmd/linux32/libstdc++.so.6" "${filesdir}/libstdc++.so.6"
+		echo -e "\e[0;31mWARNING!\e[0;39m ${gamename} requires GLIBC_2.15 or above"
 		sleep 1
 		echo ""
-	elif [ "${gamename}" == "Blade Symphony" ];then
-		fn_glibcfixmsg
-		cp -v "${rootdir}/steamcmd/linux32/libstdc++.so.6" "${filesdir}/libstdc++.so.6"
-		sleep 1
+		echo "Currently installed: GLIBC_$(ldd --version |grep ldd|awk '{print $NF}')"
+		echo "Required: => GLIBC_2.15"
 		echo ""
-	elif [ "${gamename}" == "Fistful of Frags" ];then
-		echo "Detected ${gamename}"
 		sleep 1
-		echo "Downloading files for ${gamename} GLIBC Fix"
-		sleep 1
-		cd "${filesdir}"
-		wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/FistfulOfFrags/dependencies/libm.so.6
+		echo "The installer will now detect and download the required files to allow ${gamename} server to run on a distro with GLIBC_2.14 or less."
+		echo "note: This will NOT upgrade GLIBC on your system"
 		sleep 1
 		echo ""
-	elif [ "${gamename}" == "ARMA 3" ];then
-		fn_glibcfixmsg
-		cp -v "${rootdir}/steamcmd/linux32/libstdc++.so.6" "${filesdir}/libstdc++.so.6"
+		echo "Downloading Required files"
+		echo "================================="
+		sleep 1
+		if [ "${gamename}" == "Insurgency" ]; then
+			fn_glibcfixmsg
+			cd "${filesdir}/bin"
+			wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/Insurgency/dependencies/libc.so.6
+			wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/Insurgency/dependencies/librt.so.1
+			wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/Insurgency/dependencies/libpthread.so.0
+			sleep 1
+		elif [ "${gamename}" == "Garrys's Mod" ]; then
+			fn_glibcfixmsg
+			cd "${filesdir}/bin"
+			wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/GarrysMod/dependencies/libc.so.6
+			wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/GarrysMod/dependencies/libm.so.6
+			wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/GarrysMod/dependencies/libpthread.so.0
+			cp -v "${rootdir}/steamcmd/linux32/libstdc++.so.6" "${filesdir}/libstdc++.so.6"
+			sleep 1
+			echo ""
+		elif [ "${gamename}" == "Natural Selection 2" ]; then
+			fn_glibcfixmsg
+			cd "${filesdir}"
+			wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/NaturalSelection2/dependencies/libm.so.6
+			cp -v "${rootdir}/steamcmd/linux32/libstdc++.so.6" "${filesdir}/libstdc++.so.6"
+			sleep 1
+			echo ""
+		elif [ "${gamename}" == "No More Room in Hell" ]; then
+			fn_glibcfixmsg
+			cd "${filesdir}"
+			wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/NoMoreRoomInHell/dependencies/libm.so.6
+			cp -v "${rootdir}/steamcmd/linux32/libstdc++.so.6" "${filesdir}/libstdc++.so.6"
+			sleep 1
+			echo ""
+		elif [ "${gamename}" == "Blade Symphony" ]; then
+			fn_glibcfixmsg
+			cp -v "${rootdir}/steamcmd/linux32/libstdc++.so.6" "${filesdir}/libstdc++.so.6"
+			sleep 1
+			echo ""
+		elif [ "${gamename}" == "Fistful of Frags" ]; then
+			echo "Detected ${gamename}"
+			sleep 1
+			echo "Downloading files for ${gamename} GLIBC Fix"
+			sleep 1
+			cd "${filesdir}"
+			wget -nv -N https://github.com/dgibbs64/linuxgameservers/raw/master/FistfulOfFrags/dependencies/libm.so.6
+			sleep 1
+			echo ""
+		elif [ "${gamename}" == "ARMA 3" ]; then
+			fn_glibcfixmsg
+			cp -v "${rootdir}/steamcmd/linux32/libstdc++.so.6" "${filesdir}/libstdc++.so.6"
+			sleep 1
+			echo ""
+		else
+			echo "error: Unable to detect game. Fix not applied"
+		fi
+		echo "GLIBC fix has been applied!"
 		sleep 1
 		echo ""
-	else
-		echo "error: Unable to detect game. Fix not applied"
 	fi
-	echo "GLIBC fix has been applied!"
-	sleep 1
-	echo ""
+else
+	sleep 0.1
 fi