Merge branch 'hotfix/v20.5.1'

lgsm/functions/command_wipe.sh

@@ -146,6 +146,19 @@ fn_wipe_server_files(){
 		fn_sleep_time
 		fn_script_log_pass "No player death to remove"
 	fi
+	# Wipe player states files
+	if [ -n "$(find "${serveridentitydir}" -type f -name "player.states.*.db")" ]; then
+		echo -en "removing player states player.states.*.db file(s)..."
+		fn_sleep_time
+		fn_script_log_info "Removing player states: ${serveridentitydir}/player.states.*.db"
+		find "${serveridentitydir:?}" -type f -name "player.states.*.db" -delete | tee -a "${lgsmlog}"
+		fn_wipe_exit_code
+		fn_sleep_time
+	else
+		echo -e "no player states to remove"
+		fn_sleep_time
+		fn_script_log_pass "No player states to remove"
+	fi
 	# Wipe blueprints only if full-wipe command was used.
 	if [ "${fullwipe}" == "1" ]; then
 		if [ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]; then

lgsm/functions/core_functions.sh

@@ -7,7 +7,7 @@
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-modulesversion="v20.5.0"
+modulesversion="v20.5.1"
 
 # Core
 

lgsm/functions/fix_steamcmd.sh

@@ -79,6 +79,8 @@ elif [ "${shortname}" == "cmw" ]; then
 	fn_fix_steamclient_so "32" "${executabledir}/lib"
 elif [ "${shortname}" == "cs" ]; then
 	fn_fix_steamclient_so "32" "${serverfiles}"
+elif [ "${shortname}" == "ins" ]; then
+	fn_fix_steamclient_so "32" "${serverfiles}/bin"
 elif [ "${shortname}" == "pz" ]; then
 	fn_fix_steamclient_so "32" "${serverfiles}/linux32"
 	fn_fix_steamclient_so "64" "${serverfiles}/linux64"

lgsm/functions/update_factorio.sh

@@ -112,6 +112,7 @@ fn_update_factorio_compare(){
 			command_start.sh
 			fn_firstcommand_reset
 		fi
+		unset exitbypass
 		date +%s > "${lockdir}/lastupdate.lock"
 		alert="update"
 		alert.sh

lgsm/functions/update_minecraft.sh

@@ -35,7 +35,7 @@ fn_update_minecraft_localbuild(){
 	# Gets local build info.
 	fn_print_dots "Checking local build: ${remotelocation}"
 	# Uses log file to gather info.
-	localbuild=$(grep Version "${consolelogdir}"/* 2>/dev/null | tail -1 | sed 's/.*Version //')
+	localbuild=$(grep -i version "${consolelogdir}"/* | tail -1 | sed 's/.*[Vv]ersion //' | sed 's/\r//g' 2>/dev/null)
 	if [ -z "${localbuild}" ]; then
 		fn_print_error "Checking local build: ${remotelocation}"
 		fn_print_error_nl "Checking local build: ${remotelocation}: no log files containing version info"
@@ -49,7 +49,7 @@ fn_update_minecraft_localbuild(){
 		command_start.sh
 		fn_firstcommand_reset
 		totalseconds=0
-		localbuild=$(grep Version "${consolelogdir}"/* 2>/dev/null | tail -1 | sed 's/.*Version //')
+		localbuild=$(grep -i version "${consolelogdir}"/* | tail -1 | sed 's/.*[Vv]ersion //' | sed 's/\r//g' 2>/dev/null)
 		while [ -z "${localbuild}" ]; do
 			sleep 1
 			fn_print_info "Checking local build: ${remotelocation}: waiting for log file: ${totalseconds}"
@@ -58,7 +58,7 @@ fn_update_minecraft_localbuild(){
 				fn_script_log_info "Waiting for log file to generate"
 			fi
 
-			localbuild=$(grep Version "$(ls -tr "${consolelogdir}"/* 2>/dev/null)" | tail -1 | sed 's/.*Version //')
+			localbuild=$(grep -i version "${consolelogdir}"/* | tail -1 | sed 's/.*[Vv]ersion //' | sed 's/\r//g' 2>/dev/null)
 			if [ "${totalseconds}" -gt "120" ]; then
 				localbuild="0"
 				fn_print_error "Checking local build: ${remotelocation}: waiting for log file"
@@ -145,6 +145,7 @@ fn_update_minecraft_compare(){
 			command_start.sh
 			fn_firstcommand_reset
 		fi
+		unset exitbypass
 		date +%s > "${lockdir}/lastupdate.lock"
 		alert="update"
 		alert.sh

lgsm/functions/update_minecraft_bedrock.sh

@@ -139,6 +139,7 @@ fn_update_minecraft_compare(){
 			command_start.sh
 			fn_firstcommand_reset
 		fi
+		unset exitbypass
 		date +%s > "${lockdir}/lastupdate.lock"
 		alert="update"
 		alert.sh

lgsm/functions/update_mta.sh

@@ -168,6 +168,7 @@ fn_update_mta_compare(){
 			command_start.sh
 			fn_firstcommand_reset
 		fi
+		unset exitbypass
 		date +%s > "${lockdir}/lastupdate.lock"
 		alert="update"
 		alert.sh

lgsm/functions/update_mumble.sh

@@ -104,6 +104,7 @@ fn_update_mumble_compare(){
 			command_start.sh
 			fn_firstcommand_reset
 		fi
+		unset exitbypass
 		date +%s > "${lockdir}/lastupdate.lock"
 		alert="update"
 		alert.sh

lgsm/functions/update_steamcmd.sh

@@ -113,6 +113,7 @@ fn_update_steamcmd_compare(){
 			command_start.sh
 			fn_firstcommand_reset
 		fi
+		unset exitbypass
 		date +%s > "${lockdir}/lastupdate.lock"
 		alert="update"
 		alert.sh

lgsm/functions/update_ts3.sh

@@ -166,6 +166,7 @@ fn_update_ts3_compare(){
 			command_start.sh
 			fn_firstcommand_reset
 		fi
+		unset exitbypass
 		date +%s > "${lockdir}/lastupdate.lock"
 		alert="update"
 		alert.sh

linuxgsm.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.5.0"
+version="v20.5.1"
 shortname="core"
 gameservername="core"
 commandname="CORE"

tests/tests_fctrserver.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.5.0"
+version="v20.5.1"
 shortname="fctr"
 gameservername="fctrserver"
 commandname="CORE"

tests/tests_jc2server.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.5.0"
+version="v20.5.1"
 shortname="jc2"
 gameservername="jc2server"
 commandname="CORE"

tests/tests_mcserver.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.5.0"
+version="v20.5.1"
 shortname="mc"
 gameservername="mcserver"
 commandname="CORE"

tests/tests_ts3server.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.5.0"
+version="v20.5.1"
 shortname="ts3"
 gameservername="ts3server"
 commandname="CORE"