From 1df5f0bbbd2acb4eefe0c12ce9a95e65d1d1f83f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 15 Mar 2021 14:31:51 +0000 Subject: [PATCH 1/5] fix(start): revert commit removing quotes from tmux This reverts commit 3d396049a650069fa332611b92148618c610451c. This commit broke start parameters --- lgsm/functions/command_start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_start.sh b/lgsm/functions/command_start.sh index b65e8d260..e06a0e3e5 100755 --- a/lgsm/functions/command_start.sh +++ b/lgsm/functions/command_start.sh @@ -72,7 +72,7 @@ fn_start_tmux(){ echo "${version}" >> "${lockdir}/${selfname}.lock" echo "${port}" >> "${lockdir}/${selfname}.lock" cd "${executabledir}" || exit - tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${sessionname}" ${preexecutable} ${executable} ${startparameters} 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp" + tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${sessionname}" "${preexecutable} ${executable} ${startparameters}" 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp" # Create logfile. touch "${consolelog}" From 641109750a2bdbcaac6c12ce6c4837c7ebc3ec91 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 15 Mar 2021 20:43:48 +0100 Subject: [PATCH 2/5] fix(valheim): disable queryport if public is set to 0 (#3374) --- lgsm/functions/info_parms.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/info_parms.sh b/lgsm/functions/info_parms.sh index f5533717f..f2496ce5d 100755 --- a/lgsm/functions/info_parms.sh +++ b/lgsm/functions/info_parms.sh @@ -237,7 +237,11 @@ fn_info_parms_ut(){ fn_info_parms_vh(){ port=${port:-"0"} - queryport=$((port + 1)) + if [ "${public}" != "0" ]; then + queryport=$((port + 1)) + else + querymode="1" + fi gameworld=${gameworld:-"NOT SET"} serverpassword=${serverpassword:-"NOT SET"} servername=${servername:-"NOT SET"} From 23f6c9a35ca8e194dc7ae5dc1a73c03a6c04c4ad Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 15 Mar 2021 20:02:33 +0000 Subject: [PATCH 3/5] fix(config): parms setting will work again if present in configs (#3381) * fix(config): parms setting will work again if present in configs This will allow the legacy "parms" to still function --- linuxgsm.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/linuxgsm.sh b/linuxgsm.sh index 0182d24db..86957eb39 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -465,7 +465,25 @@ else elif grep -qE "^[[:blank:]]*startparameters=" "${configdirserver}/_default.cfg"; then eval startparameters="$(sed -nr 's/^ *startparameters=(.*)$/\1/p' "${configdirserver}/_default.cfg")" fi + + # For legacy configs that still use parms= 15.03.21 + if grep -qE "^[[:blank:]]*parms=" "${configdirserver}/secrets-${selfname}.cfg"; then + eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/secrets-${selfname}.cfg")" + elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/${selfname}.cfg"; then + eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/${selfname}.cfg")" + elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/secrets-common.cfg"; then + eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/secrets-common.cfg")" + elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/common.cfg"; then + eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/common.cfg")" + elif grep -qE "^[[:blank:]]*parms=" "${configdirserver}/_default.cfg"; then + eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/_default.cfg")" + fi + + if [ -n "${parms}" ]; then + startparameters="${parms}" + fi } + fn_reload_startparameters # Load the linuxgsm.sh in to tmpdir. If missing download it. if [ ! -f "${tmpdir}/linuxgsm.sh" ]; then From 342c48c9cf0f699585ffa45a459149adf1faf972 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 15 Mar 2021 21:04:30 +0100 Subject: [PATCH 4/5] fix(core): fix start paramerter reloading (#3380) * fix(core): fix start paramerter reloading Co-authored-by: Daniel Gibbs --- linuxgsm.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/linuxgsm.sh b/linuxgsm.sh index 86957eb39..615ed9b41 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -453,7 +453,7 @@ else # shellcheck source=/dev/null source "${servercfgfullpath}" fi - + # reload startparameters. if grep -qE "^[[:blank:]]*startparameters=" "${configdirserver}/secrets-${selfname}.cfg"; then eval startparameters="$(sed -nr 's/^ *startparameters=(.*)$/\1/p' "${configdirserver}/secrets-${selfname}.cfg")" elif grep -qE "^[[:blank:]]*startparameters=" "${configdirserver}/${selfname}.cfg"; then @@ -466,6 +466,18 @@ else eval startparameters="$(sed -nr 's/^ *startparameters=(.*)$/\1/p' "${configdirserver}/_default.cfg")" fi +# reload preexecutable. + if grep -qE "^[[:blank:]]*preexecutable=" "${configdirserver}/secrets-${selfname}.cfg"; then + eval preexecutable="$(sed -nr 's/^ *preexecutable=(.*)$/\1/p' "${configdirserver}/secrets-${selfname}.cfg")" + elif grep -qE "^[[:blank:]]*preexecutable=" "${configdirserver}/${selfname}.cfg"; then + eval preexecutable="$(sed -nr 's/^ *preexecutable=(.*)$/\1/p' "${configdirserver}/${selfname}.cfg")" + elif grep -qE "^[[:blank:]]*preexecutable=" "${configdirserver}/secrets-common.cfg"; then + eval preexecutable="$(sed -nr 's/^ *preexecutable=(.*)$/\1/p' "${configdirserver}/secrets-common.cfg")" + elif grep -qE "^[[:blank:]]*preexecutable=" "${configdirserver}/common.cfg"; then + eval preexecutable="$(sed -nr 's/^ *preexecutable=(.*)$/\1/p' "${configdirserver}/common.cfg")" + elif grep -qE "^[[:blank:]]*preexecutable=" "${configdirserver}/_default.cfg"; then + eval preexecutable="$(sed -nr 's/^ *preexecutable=(.*)$/\1/p' "${configdirserver}/_default.cfg")" + # For legacy configs that still use parms= 15.03.21 if grep -qE "^[[:blank:]]*parms=" "${configdirserver}/secrets-${selfname}.cfg"; then eval parms="$(sed -nr 's/^ *parms=(.*)$/\1/p' "${configdirserver}/secrets-${selfname}.cfg")" From 5ad8422784afacc32bdd4a385d22ec85b6e147aa Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 15 Mar 2021 22:48:48 +0000 Subject: [PATCH 5/5] Release v21.2.2 --- lgsm/functions/core_functions.sh | 2 +- linuxgsm.sh | 2 +- tests/tests_fctrserver.sh | 2 +- tests/tests_jc2server.sh | 2 +- tests/tests_mcserver.sh | 2 +- tests/tests_ts3server.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh index 6f232a18d..89b0ef0fa 100755 --- a/lgsm/functions/core_functions.sh +++ b/lgsm/functions/core_functions.sh @@ -8,7 +8,7 @@ functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")" -modulesversion="v21.2.1" +modulesversion="v21.2.2" # Core diff --git a/linuxgsm.sh b/linuxgsm.sh index 615ed9b41..05ec72e53 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.2.1" +version="v21.2.2" shortname="core" gameservername="core" commandname="CORE" diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh index d5a2919ee..c4a716aa9 100644 --- a/tests/tests_fctrserver.sh +++ b/tests/tests_fctrserver.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.2.1" +version="v21.2.2" shortname="fctr" gameservername="fctrserver" commandname="CORE" diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 792ceb2a6..ff1eec547 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.2.1" +version="v21.2.2" shortname="jc2" gameservername="jc2server" commandname="CORE" diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh index d6006c669..ce24f3df0 100644 --- a/tests/tests_mcserver.sh +++ b/tests/tests_mcserver.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.2.1" +version="v21.2.2" shortname="mc" gameservername="mcserver" commandname="CORE" diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh index 344c9083e..d867b41ac 100644 --- a/tests/tests_ts3server.sh +++ b/tests/tests_ts3server.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.2.1" +version="v21.2.2" shortname="ts3" gameservername="ts3server" commandname="CORE"