Explorar el Código

Merge branch 'hotfix/v20.2.1'

Daniel Gibbs hace 6 años
padre
commit
6985449fda

+ 6 - 5
lgsm/functions/update_steamcmd.sh

@@ -47,11 +47,6 @@ fn_update_steamcmd_localbuild(){
 	# Uses appmanifest to find local build.
 	localbuild=$(grep buildid "${appmanifestfile}" | tr '[:blank:]"' ' ' | tr -s ' ' | cut -d\  -f3)
 
-	# Removes appinfo.vdf as a fix for not always getting up to date version info from SteamCMD.
-	if [ -f "${HOME}/.steam/appcache/appinfo.vdf" ]; then
-		rm -f "${HOME}/.steam/appcache/appinfo.vdf"
-	fi
-
 	# Set branch for updateinfo.
 	IFS=' ' read -ra branchsplits <<< "${branch}"
 	if [ "${#branchsplits[@]}" -gt 1 ]; then
@@ -76,6 +71,12 @@ fn_update_steamcmd_remotebuild(){
 	if [ -d "${steamcmddir}" ]; then
 		cd "${steamcmddir}" || exit
 	fi
+
+	# Removes appinfo.vdf as a fix for not always getting up to date version info from SteamCMD.
+	if [ "$(find "${HOME}" -type f -name "appinfo.vdf" | wc -l)" -ne "0" ]; then
+		find "${HOME}" -type f -name "appinfo.vdf" -exec rm -f {} \;
+	fi
+
 	remotebuild=$(${steamcmdcommand} +login "${steamuser}" "${steampass}" +app_info_update 1 +app_info_print "${appid}" +quit | sed '1,/branches/d' | sed "1,/${branchname}/d" | grep -m 1 buildid | tr -cd '[:digit:]')
 	if [ "${installer}" != "1" ]; then
 		fn_print_dots "Checking remote build: ${remotelocation}"

+ 1 - 1
linuxgsm.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.2.0"
+version="v20.2.1"
 shortname="core"
 gameservername="core"
 rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")

+ 1 - 1
tests/tests_fctrserver.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.2.0"
+version="v20.2.1"
 shortname="fctr"
 gameservername="fctrserver"
 rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")

+ 1 - 1
tests/tests_jc2server.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.2.0"
+version="v20.2.1"
 shortname="jc2"
 gameservername="jc2server"
 rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")

+ 1 - 1
tests/tests_mcserver.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.2.0"
+version="v20.2.1"
 shortname="mc"
 gameservername="mcserver"
 rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")

+ 1 - 1
tests/tests_ts3server.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.2.0"
+version="v20.2.1"
 shortname="ts3"
 gameservername="ts3server"
 rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")