From 70e1a82b6618548856bfcf200cb445c8913b4219 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 2 Dec 2019 20:29:12 +0000 Subject: [PATCH 1/5] fix(ut99server): correct query mode for ut99 --- lgsm/config-default/config-lgsm/ut99server/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/ut99server/_default.cfg b/lgsm/config-default/config-lgsm/ut99server/_default.cfg index 3eb9e8043f..d8d80345d8 100644 --- a/lgsm/config-default/config-lgsm/ut99server/_default.cfg +++ b/lgsm/config-default/config-lgsm/ut99server/_default.cfg @@ -120,7 +120,7 @@ stopmode="2" # 4: gsquery # 5: tcp querymode="2" -querytype="protocol-unreal2" +querytype="protocol-gamespy1" ## Game Server Details # Do not edit From 0b9fbfc01e9ffb1bf9fcf3d386b11be730d10bf0 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 2 Dec 2019 21:31:35 +0100 Subject: [PATCH 2/5] fix(sdtdserver): restore serverconfig setting (#2640) --- lgsm/config-default/config-lgsm/sdtdserver/_default.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg index 0f56ec19be..4355298bb5 100644 --- a/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sdtdserver/_default.cfg @@ -148,6 +148,7 @@ executable=$([ "$(uname -m)" == "x86_64" ] && echo -e "./7DaysToDieServer.x86_64 servercfgdefault="serverconfig.xml" servercfgfullpathdefault="${serverfiles}/${servercfgdefault}" servercfgdir="${serverfiles}" +servercfg="${selfname}.xml" servercfgfullpath="${servercfgdir}/${servercfg}" ## Backup Directory From 5808a3d99daf865e7e0b88bdc3db99bf2be62326 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 2 Dec 2019 21:09:34 +0000 Subject: [PATCH 3/5] fix(core-dl): adjust unzip options and revert curl changes --- lgsm/functions/core_dl.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/core_dl.sh b/lgsm/functions/core_dl.sh index 84768bebb4..24cff68bf7 100644 --- a/lgsm/functions/core_dl.sh +++ b/lgsm/functions/core_dl.sh @@ -81,7 +81,7 @@ fn_dl_extract(){ elif [ "${mime}" == "application/x-xz" ]; then tarcmd=$(tar -xf "${local_filedir}/${local_filename}" -C "${extractdir}") elif [ "${mime}" == "application/zip" ]; then - extractcmd=$(unzip -dq "${extractdir}" "${local_filedir}/${local_filename}") + extractcmd=$(unzip -qo -d "${extractdir}" "${local_filedir}/${local_filename}") fi local exitcode=$? if [ ${exitcode} -ne 0 ]; then @@ -133,11 +133,11 @@ fn_fetch_file(){ echo -en "downloading ${local_filename}..." fn_sleep_time echo -en "\033[1K" - curlcmd=$(curl --progress-bar --retry 10 --retry-delay 3 --fail -L -C - -o "${local_filedir}/${local_filename}" "${remote_fileurl}") + curlcmd=$(curl --progress-bar --fail -L -o "${local_filedir}/${local_filename}" "${remote_fileurl}") echo -en "downloading ${local_filename}..." else echo -en " fetching ${local_filename}...\c" - curlcmd=$(curl -s --retry 3 --retry-delay 3 --fail -L -C - -o "${local_filedir}/${local_filename}" "${remote_fileurl}" 2>&1) + curlcmd=$(curl -s --fail -L -o "${local_filedir}/${local_filename}" "${remote_fileurl}" 2>&1) fi local exitcode=$? if [ ${exitcode} -ne 0 ]; then From e39f262812b108c55bc835ceacd3fabb89fc0190 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 2 Dec 2019 21:10:12 +0000 Subject: [PATCH 4/5] fix(sbotsserver): add missing setting --- lgsm/config-default/config-lgsm/sbotsserver/_default.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg index d426769be0..e5d21ae7eb 100644 --- a/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/sbotsserver/_default.cfg @@ -83,6 +83,9 @@ telegramtoken="accesstoken" telegramchatid="" curlcustomstring="" +## Updating | https://docs.linuxgsm.com/commands/update +updateonstart="off" + ## Backup | https://docs.linuxgsm.com/commands/backup maxbackups="4" maxbackupdays="30" From 715367ee8e8387a42a7d2cd5cb8eea66d7dc50c0 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 2 Dec 2019 22:12:11 +0000 Subject: [PATCH 5/5] release v19.12.4 --- linuxgsm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linuxgsm.sh b/linuxgsm.sh index 556cb2e53d..e7a7bc67ea 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v19.12.3" +version="v19.12.4" shortname="core" gameservername="core" rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")