Merge branch 'release/v23.5.3'

2025-01-08 12:07:37 +08:00 · 2023-09-26 10:36:39 +01:00 · 2023-09-26 10:36:39 +01:00 · 11d8d1c68c
commit 11d8d1c68c
parent 32ecb5c0db 18facaddbc
33 changed files with 43 additions and 37 deletions
--- a/lgsm/config-default/config-lgsm/ckserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ckserver/_default.cfg
@ -8,6 +8,7 @@

 #### Game Server Settings ####

+## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
 ip="0.0.0.0"
 port="1234"

--- a/lgsm/config-default/config-lgsm/colserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/colserver/_default.cfg
@ -9,7 +9,7 @@
 #### Game Server Settings ####

 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-# Edit with care | https://colonysurvival.gamepedia.com/Dedicated_Server#Installation_.28Linux.29
+## https://colonysurvival.gamepedia.com/Dedicated_Server#Installation_.28Linux.29
 startparameters="-batchmode -nographics +server.config ${servercfgfullpath}"

 #### LinuxGSM Settings ####
--- a/lgsm/config-default/config-lgsm/fctrserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/fctrserver/_default.cfg
@ -13,8 +13,7 @@ ip="0.0.0.0"
 port="34197"
 rconport="34198"
 rconpassword="CHANGE_ME"
-# (stable|experimental)
-branch="stable"
+branch="stable" # values: stable, experimental

 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 startparameters="--bind ${ip} --start-server ${serverfiles}/save1.zip --server-settings ${servercfgfullpath} --port ${port} --rcon-port ${rconport} --rcon-password ${rconpassword}"
--- a/lgsm/config-default/config-lgsm/hwserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/hwserver/_default.cfg
@ -9,13 +9,13 @@
 #### Game Server Settings ####

 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
-servername="LinuxGSM Server"
+servername="LinuxGSM"
 ip="0.0.0.0"
 port="12871"
 queryport="12881"
 maxplayers="20"
-defaultmap=""    # Optional
-creativemode="0" # Free Build: creativemode="1"
+defaultmap="nullius"
+creativemode="0" # values: Free Build = 1, Survival = 0

 ## Add admins using STEAMID64
 # Example : addadmin 012345678901234567; addadmin 987654321098765432
--- a/lgsm/config-default/config-lgsm/ohdserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/ohdserver/_default.cfg
@ -12,7 +12,7 @@
 ip="0.0.0.0"
 port="7777"
 queryport="27005"
-servername="LinuxGSM Server"
+servername="LinuxGSM"
 serverpassword=""
 # Maps: risala, khafji_p, lamdong, montecassino, argonne
 defaultmap="AAS-TestMap"
--- a/lgsm/config-default/config-lgsm/pvrserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/pvrserver/_default.cfg
@ -11,7 +11,6 @@
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
 ip="0.0.0.0"
 port="7777"
-
 # Maps: bridge, datacenter, sand
 defaultmap="datacenter"
 # Get an API key from https://pavlov-ms.vankrupt.com/servers/v1/key
--- a/lgsm/config-default/config-lgsm/rustserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/rustserver/_default.cfg
@ -15,10 +15,10 @@ rconport="28016"
 appport="28082"
 queryport="28017"
 rconpassword="CHANGE_ME"
-rconweb="1" # Value is: 1 for the Facepunch web panel, Rustadmin desktop and Rustadmin Online; 0 for RCON tools like Rusty.
+rconweb="1" # values: Facepunch web panel, Rustadmin desktop and Rustadmin Online = 1, Rusty = 0.
 servername="Rust"
-gamemode="vanilla"           # Values: vanilla, softcore ( Doc: https://wiki.facepunch.com/rust/server-gamemodes )
-serverlevel="Procedural Map" # Values: Procedural Map, Barren, HapisIsland, SavasIsland
+gamemode="vanilla"           # values: vanilla, softcore ( Doc: https://wiki.facepunch.com/rust/server-gamemodes )
+serverlevel="Procedural Map" # values: Procedural Map, Barren, HapisIsland, SavasIsland
 customlevelurl=""            # Custom level url. +server.levelurl \"${customlevelurl}\"
 seed=""                      # range: 1-2147483647, used to reproduce a procedural map.
 salt=""                      # range: unknown, used to recover a known setting from an existing map.
--- a/lgsm/config-default/config-lgsm/untserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/untserver/_default.cfg
@ -14,8 +14,8 @@ port="27015"
 maxplayers="20"
 defaultmap="PEI"
 servername="LinuxGSM"
-perspective="first" # Values: first, third, vehicle, Both.
-gamemode="normal" # Values: normal, easy, gold.
+perspective="first" # values: first, third, vehicle, Both.
+gamemode="normal" # values: normal, easy, gold.

 ## Game Server Login Token (GSLT): Required
 # GSLT is required for running a public server.
--- a/lgsm/data/debian-10.csv
+++ b/lgsm/data/debian-10.csv
@ -1,4 +1,4 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,uuid-runtime,wget,xz-utils
 steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
 ac
 ahl
--- a/lgsm/data/debian-11.csv
+++ b/lgsm/data/debian-11.csv
@ -1,4 +1,4 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,uuid-runtime,wget,xz-utils
 steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
 ac
 ahl
--- a/lgsm/data/debian-12.csv
+++ b/lgsm/data/debian-12.csv
@ -1,4 +1,4 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat-traditional,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat-traditional,python3,tar,tmux,unzip,util-linux,uuid-runtime,wget,xz-utils
 steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
 ac
 ahl
--- a/lgsm/data/ubuntu-16.04.csv
+++ b/lgsm/data/ubuntu-16.04.csv
@ -1,4 +1,4 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,uuid-runtime,wget,xz-utils
 steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
 ac
 ahl
--- a/lgsm/data/ubuntu-18.04.csv
+++ b/lgsm/data/ubuntu-18.04.csv
@ -1,4 +1,4 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,uuid-runtime,wget,xz-utils
 steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
 ac
 ahl
--- a/lgsm/data/ubuntu-20.04.csv
+++ b/lgsm/data/ubuntu-20.04.csv
@ -1,4 +1,4 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,uuid-runtime,wget,xz-utils
 steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
 ac
 ahl
--- a/lgsm/data/ubuntu-22.04.csv
+++ b/lgsm/data/ubuntu-22.04.csv
@ -1,4 +1,4 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,uuid-runtime,wget,xz-utils
 steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
 ac
 ahl
--- a/lgsm/data/ubuntu-23.04.csv
+++ b/lgsm/data/ubuntu-23.04.csv
@ -1,4 +1,4 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,distro-info,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat,python3,tar,tmux,unzip,util-linux,uuid-runtime,wget,xz-utils
 steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
 ac
 ahl
--- a/lgsm/modules/command_dev_query_raw.sh
+++ b/lgsm/modules/command_dev_query_raw.sh
@ -260,6 +260,8 @@ echo -e ""
 echo -e "${lightgreen}Steam Master Server Response${default}"
 echo -e "=================================================================="
 echo -e ""
+echo -e "curl -m 3 -s https://api.steampowered.com/ISteamApps/GetServersAtAddress/v0001?addr=${publicip}"
+echo -e ""
 echo -e "Response: ${displaymasterserver}"
 echo -e ""

--- a/lgsm/modules/core_functions.sh
+++ b/lgsm/modules/core_functions.sh
@ -8,7 +8,7 @@

 module_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"

-modulesversion="v23.5.2"
+modulesversion="v23.5.3"

 # Core

--- a/lgsm/modules/core_modules.sh
+++ b/lgsm/modules/core_modules.sh
@ -8,7 +8,7 @@

 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"

-modulesversion="v23.5.2"
+modulesversion="v23.5.3"

 # Core

@ -816,6 +816,11 @@ if [ ! -d "${lockdir}" ]; then
 	mkdir -p "${lockdir}"
 fi

+# if $USER id missing set to whoami
+if [ -z "${USER}" ]; then
+	USER="$(whoami)"
+fi
+
 # Calls on-screen messages (bootstrap)
 core_messages.sh

--- a/lgsm/modules/core_steamcmd.sh
+++ b/lgsm/modules/core_steamcmd.sh
@ -179,7 +179,7 @@ fn_update_steamcmd_remotebuild() {
 	fi

 	# added as was failing GitHub Actions test. Running SteamCMD twice seems to fix it.
-	${steamcmdcommand} +login "${steamuser}" "${steampass}" +app_info_update 1 +quit 2> /dev/null
+	${steamcmdcommand} +login "${steamuser}" "${steampass}" +app_info_update 1 +quit > /dev/null 2>&1
 	# password for branch not needed to check the buildid
 	remotebuildversion=$(${steamcmdcommand} +login "${steamuser}" "${steampass}" +app_info_update 1 +app_info_print "${appid}" +quit | sed -e '/"branches"/,/^}/!d' | sed -n "/\"${branch}\"/,/}/p" | grep -m 1 buildid | tr -cd '[:digit:]')

--- a/lgsm/modules/info_messages.sh
+++ b/lgsm/modules/info_messages.sh
@ -762,7 +762,7 @@ fn_info_logs() {
 		else
 			echo -e "${gamelogdir}"
 			# dos2unix sed 's/\r//'
-			tail "${gamelogdir}"/* 2> /dev/null | grep -v "==>" | sed '/^$/d' | sed 's/\r//' | tail -25
+			tail "${gamelogdir}"/* 2> /dev/null | grep -av "==>" | sed '/^$/d' | sed 's/\r//' | tail -25
 		fi
 		echo -e ""
 	fi
--- a/lgsm/modules/update_fctr.sh
+++ b/lgsm/modules/update_fctr.sh
@ -93,6 +93,7 @@ fn_update_compare() {
 		fn_script_log_info "${localbuild} > ${remotebuildversion}"

 		if [ "${commandname}" == "UPDATE" ]; then
+			date +%s > "${lockdir}/last-updated.lock"
 			unset updateonstart
 			check_status.sh
 			# If server stopped.
@ -120,7 +121,6 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
--- a/lgsm/modules/update_mc.sh
+++ b/lgsm/modules/update_mc.sh
@ -105,6 +105,7 @@ fn_update_compare() {
 		fn_script_log_info "${localbuild} > ${remotebuildversion}"

 		if [ "${commandname}" == "UPDATE" ]; then
+			date +%s > "${lockdir}/last-updated.lock"
 			unset updateonstart
 			check_status.sh
 			# If server stopped.
@ -132,7 +133,6 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
--- a/lgsm/modules/update_mcb.sh
+++ b/lgsm/modules/update_mcb.sh
@ -111,6 +111,7 @@ fn_update_compare() {
 		fn_script_log_info "${localbuild} > ${remotebuildversion}"

 		if [ "${commandname}" == "UPDATE" ]; then
+			date +%s > "${lockdir}/last-updated.lock"
 			unset updateonstart
 			check_status.sh
 			# If server stopped.
@ -138,7 +139,6 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
--- a/lgsm/modules/update_pmc.sh
+++ b/lgsm/modules/update_pmc.sh
@ -115,6 +115,7 @@ fn_update_compare() {
 		fn_script_log_info "${localbuild} > ${remotebuildversion}"

 		if [ "${commandname}" == "UPDATE" ]; then
+			date +%s > "${lockdir}/last-updated.lock"
 			unset updateonstart
 			check_status.sh
 			# If server stopped.
@ -142,7 +143,6 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
--- a/lgsm/modules/update_ts3.sh
+++ b/lgsm/modules/update_ts3.sh
@ -97,6 +97,7 @@ fn_update_compare() {
 		fn_script_log_info "${localbuild} > ${remotebuildversion}"

 		if [ "${commandname}" == "UPDATE" ]; then
+			date +%s > "${lockdir}/last-updated.lock"
 			unset updateonstart
 			check_status.sh
 			# If server stopped.
@ -124,7 +125,6 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
--- a/lgsm/modules/update_ut99.sh
+++ b/lgsm/modules/update_ut99.sh
@ -91,6 +91,7 @@ fn_update_compare() {
 		fn_script_log_info "${localbuild} > ${remotebuildversion}"

 		if [ "${commandname}" == "UPDATE" ]; then
+			date +%s > "${lockdir}/last-updated.lock"
 			unset updateonstart
 			check_status.sh
 			# If server stopped.
@ -118,7 +119,6 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
--- a/lgsm/modules/update_vints.sh
+++ b/lgsm/modules/update_vints.sh
@ -98,6 +98,7 @@ fn_update_compare() {
 		fn_script_log_info "${localbuild} > ${remotebuildversion}"

 		if [ "${commandname}" == "UPDATE" ]; then
+			date +%s > "${lockdir}/last-updated.lock"
 			unset updateonstart
 			check_status.sh
 			# If server stopped.
@ -125,7 +126,6 @@ fn_update_compare() {
 				fn_firstcommand_reset
 			fi
 			unset exitbypass
-			date +%s > "${lockdir}/last-updated.lock"
 			alert="update"
 		elif [ "${commandname}" == "CHECK-UPDATE" ]; then
 			alert="check-update"
--- a/linuxgsm.sh
+++ b/linuxgsm.sh
@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi

-version="v23.5.2"
+version="v23.5.3"
 shortname="core"
 gameservername="core"
 commandname="CORE"
--- a/tests/tests_fctrserver.sh
+++ b/tests/tests_fctrserver.sh
@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi

-version="v23.5.2"
+version="v23.5.3"
 shortname="fctr"
 gameservername="fctrserver"
 commandname="CORE"
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi

-version="v23.5.2"
+version="v23.5.3"
 shortname="jc2"
 gameservername="jc2server"
 commandname="CORE"
--- a/tests/tests_mcserver.sh
+++ b/tests/tests_mcserver.sh
@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi

-version="v23.5.2"
+version="v23.5.3"
 shortname="mc"
 gameservername="mcserver"
 commandname="CORE"
--- a/tests/tests_ts3server.sh
+++ b/tests/tests_ts3server.sh
@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi

-version="v23.5.2"
+version="v23.5.3"
 shortname="ts3"
 gameservername="ts3server"
 commandname="CORE"