Merge branch 'hotfix/v20.6.1'

GameServerManagers · Dec 5, 2020 · 22a76ce · 22a76ce
2 parents 01f8265 + db559aa
commit 22a76ce
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh
@@ -108,12 +108,12 @@ for queryattempt in {1..5}; do
 		fn_print_querying_eol
 		fn_script_log_info "Querying port: ${querymethod}: ${queryip}:${queryport} : ${queryattempt} : QUERYING"
 		# querydelay
-		if [ "$(cat "${lockdir}/${selfname}.lock")" -gt "$(date "+%s" -d "${querydelay} mins ago")" ]; then
+		if [ "$(head -n 1 "${lockdir}/${selfname}.lock")" -gt "$(date "+%s" -d "${querydelay} mins ago")" ]; then
 			fn_print_ok "Querying port: ${querymethod}: ${ip}:${queryport} : ${totalseconds}/${queryattempt}: "
 			fn_print_delay_eol_nl
 			fn_script_log_info "Querying port: ${querymethod}: ${ip}:${queryport} : ${queryattempt} : DELAY"
 			fn_script_log_info "Query bypassed: ${gameservername} started less than ${querydelay} minutes ago"
-			fn_script_log_info "Server started: $(date -d @$(cat "${lockdir}/${selfname}.lock"))"
+			fn_script_log_info "Server started: $(date -d @$(head -n 1 "${lockdir}/${selfname}.lock"))"
 			fn_script_log_info "Current time: $(date)"
 			monitorpass=1
 			core_exit.sh

diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh
@@ -7,7 +7,7 @@
 
 functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
-modulesversion="v20.6.0"
+modulesversion="v20.6.1"
 
 # Core
 

diff --git a/linuxgsm.sh b/linuxgsm.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.6.0"
+version="v20.6.1"
 shortname="core"
 gameservername="core"
 commandname="CORE"

diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.6.0"
+version="v20.6.1"
 shortname="fctr"
 gameservername="fctrserver"
 commandname="CORE"

diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.6.0"
+version="v20.6.1"
 shortname="jc2"
 gameservername="jc2server"
 commandname="CORE"

diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.6.0"
+version="v20.6.1"
 shortname="mc"
 gameservername="mcserver"
 commandname="CORE"

diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.6.0"
+version="v20.6.1"
 shortname="ts3"
 gameservername="ts3server"
 commandname="CORE"
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
     functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
-    modulesversion="v20.6.0"
+    modulesversion="v20.6.1"
     # Core
@@ Expand Down @@