Просмотр исходного кода

fix(fix): re-add fix_tf2 and minor fix refactor (#2279)

Daniel Gibbs 7 лет назад
Родитель
Сommit
5058214388

+ 23 - 22
lgsm/functions/fix.sh

@@ -61,8 +61,10 @@ if [ "${function_selfname}" != "command_install.sh" ]&&[ -z "${fixbypass}" ]; th
 		fix_sdtd.sh
 	elif [ "${shortname}" == "ss3" ]; then
 		fix_ss3.sh
+	elif [ "${shortname}" == "tf2" ]; then
+		fix_tf2.sh
 	elif [ "${shortname}" == "ts3" ]; then
-		fix_ts3.sh		
+		fix_ts3.sh
 	elif [ "${shortname}" == "mta" ]; then
 		fix_mta.sh
 	elif [ "${shortname}" == "wurm" ]; then
@@ -72,26 +74,25 @@ fi
 
 # Fixes that are run on install only.
 if [ "${function_selfname}" == "command_install.sh" ]; then
-		echo ""
-		echo "Applying Post-Install Fixes"
-		echo "================================="
-		sleep 0.5
-		if [ "${shortname}" == "kf" ]; then
-			fix_kf.sh
-		elif [ "${shortname}" == "kf2" ]; then
-			fix_kf2.sh
-		elif [ "${shortname}" == "ro" ]; then
-			fix_ro.sh
-		elif [ "${shortname}" == "ut2k4" ]; then
-			fix_ut2k4.sh
-		elif [ "${shortname}" == "ut" ]; then
-			fix_ut.sh
-		elif [ "${shortname}" == "ut3" ]; then
-			fix_ut3.sh
-		elif [ "${shortname}" == "tf2" ]; then
-			fix_tf2.sh
-		else
-			fn_print_information_nl "No fixes required."
+		if [ "${shortname}" == "kf" ]||[ "${shortname}" == "kf2" ]||[ "${shortname}" == "ro" ]||[ "${shortname}" == "ut2k4" ]||[ "${shortname}" == "ut" ]||[ "${shortname}" == "ut3" ]; then
+			echo ""
+			echo "Applying Post-Install Fixes"
+			echo "================================="
+			sleep 0.5
+			if [ "${shortname}" == "kf" ]; then
+				fix_kf.sh
+			elif [ "${shortname}" == "kf2" ]; then
+				fix_kf2.sh
+			elif [ "${shortname}" == "ro" ]; then
+				fix_ro.sh
+			elif [ "${shortname}" == "ut2k4" ]; then
+				fix_ut2k4.sh
+			elif [ "${shortname}" == "ut" ]; then
+				fix_ut.sh
+			elif [ "${shortname}" == "ut3" ]; then
+				fix_ut3.sh
+			else
+				fn_print_information_nl "No fixes required."
+			fi
 		fi
-
 fi

+ 2 - 2
lgsm/functions/fix_dst.sh

@@ -11,8 +11,8 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 # Fixes: ./dontstarve_dedicated_server_nullrenderer: ./lib32/libcurl-gnutls.so.4: no version information available (required by ./dontstarve_dedicated_server_nullrenderer)
 # Issue only occures on CentOS as libcurl-gnutls.so.4 is called libcurl.so.4 on CentOS.
 if [ -f "/etc/redhat-release" ]&&[ ! -f "${serverfiles}/bin/lib32/libcurl-gnutls.so.4" ]; then
-	fixname="libcurl-gnutls.so.4 missing"
+	fixname="libcurl-gnutls.so.4"
 	fn_fix_msg_start
 	ln -s "/usr/lib/libcurl.so.4" "${serverfiles}/bin/lib32/libcurl-gnutls.so.4"
 	fn_fix_msg_end
-fi
+fi

+ 1 - 1
lgsm/functions/fix_mta.sh

@@ -16,4 +16,4 @@ if [ ! -f "${lgsmdir}/lib/libmysqlclient.so.16" ]; then
 	fn_fix_msg_end
 fi
 
-export LD_LIBRARY_PATH=:"${libdir}"
+export LD_LIBRARY_PATH=:"${libdir}"

+ 4 - 1
lgsm/functions/fix_ss3.sh

@@ -10,5 +10,8 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Fixes https://steamcommunity.com/app/41070/discussions/0/353916981477716386/
 if [ "$(diff "${steamcmddir}/linux32/steamclient.so" "${serverfiles}/Bin/steamclient.so" >/dev/null)" ]; then
+	fixname="steamclient.so"
+	fn_fix_msg_start
 	cp -f "${steamcmddir}/linux32/steamclient.so" "${serverfiles}/Bin/steamclient.so"
-fi
+	fn_fix_msg_end
+fi

+ 4 - 4
lgsm/functions/fix_steamcmd.sh

@@ -10,7 +10,7 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Fixes: [S_API FAIL] SteamAPI_Init() failed; unable to locate a running instance of Steam,or a local steamclient.so.
 if [ ! -f "${HOME}/.steam/sdk32/steamclient.so" ]; then
-	fixname="steamclient.so general"
+	fixname="steamclient.so"
 	fn_fix_msg_start
 	mkdir -pv "${HOME}/.steam/sdk32" >> "${lgsmlog}"
 	cp -v "${steamcmddir}/linux32/steamclient.so" "${HOME}/.steam/sdk32/steamclient.so" >> "${lgsmlog}"
@@ -23,7 +23,7 @@ if [ "${shortname}" == "ss3" ]; then
 		fixname="libsteam.so"
 		fn_fix_msg_start
 		mkdir -pv "${HOME}/.steam/bin32" >> "${lgsmlog}"
-		cp -v "${serverfiles}/Bin/libsteam.so" "${HOME}/.steam/bin32/libsteam.so" >> "${lgsmlog}"
+		cp "${serverfiles}/Bin/libsteam.so" "${HOME}/.steam/bin32/libsteam.so" >> "${lgsmlog}"
 		fn_fix_msg_end
 	fi
 elif [ "${shortname}" == "hw" ]; then
@@ -31,13 +31,13 @@ elif [ "${shortname}" == "hw" ]; then
 	if [ ! -f "${serverfiles}/Hurtworld_Data/Plugins/x86/steamclient.so" ]; then
 		fixname="steamclient.so x86"
 		fn_fix_msg_start
-		cp -v "${steamcmddir}/linux32/steamclient.so" "${serverfiles}/Hurtworld_Data/Plugins/x86/steamclient.so" >> "${lgsmlog}"
+		cp "${steamcmddir}/linux32/steamclient.so" "${serverfiles}/Hurtworld_Data/Plugins/x86/steamclient.so" >> "${lgsmlog}"
 		fn_fix_msg_end
 	fi
 	if [ ! -f "${serverfiles}/Hurtworld_Data/Plugins/x86_64/steamclient.so" ]; then
 		fixname="steamclient.so x86_64"
 		fn_fix_msg_start
-		cp -v "${steamcmddir}/linux32/steamclient.so" "${serverfiles}/Hurtworld_Data/Plugins/x86_64/steamclient.so" >> "${lgsmlog}"
+		cp "${steamcmddir}/linux32/steamclient.so" "${serverfiles}/Hurtworld_Data/Plugins/x86_64/steamclient.so" >> "${lgsmlog}"
 		fn_fix_msg_end
 	fi
 elif [ "${shortname}" == "tu" ]; then

+ 1 - 1
lgsm/functions/fix_tf2.sh

@@ -10,7 +10,7 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Fixes: Team Fortress 2 Segmentation fault for Red-Hat Distros #2062.
 if [ -f "/etc/redhat-release" ]&&[ ! -f "${serverfiles}/bin/libcurl-gnutls.so.4" ]; then
-	fixname="libcurl-gnutls.so.4 missing"
+	fixname="libcurl-gnutls.so.4"
 	fn_fix_msg_start
 	ln -s "/usr/lib/libcurl.so.4" "${serverfiles}/bin/libcurl-gnutls.so.4"
 	fn_fix_msg_end

+ 5 - 2
lgsm/functions/fix_ts3.sh

@@ -10,5 +10,8 @@ local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Fixes: makes libmariadb2 available #1924
 if [ ! -f "${serverfiles}/libmariadb.so.2" ]; then
-	ln -s "${serverfiles}/redist/libmariadb.so.2" "${serverfiles}/libmariadb.so.2"
-fi
+	fixname="libmariadb.so.2"
+	fn_fix_msg_start
+	cp "${serverfiles}/redist/libmariadb.so.2" "${serverfiles}/libmariadb.so.2"
+	fn_fix_msg_end	
+fi