From 3eeaf8fcc7f67d693e0c6757c5d69200baa659af Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 14 Mar 2021 17:23:37 +0000 Subject: [PATCH 1/3] Release v21.1.1 --- 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 aaf4a163c..6f232a18d 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.0" +modulesversion="v21.2.1" # Core diff --git a/linuxgsm.sh b/linuxgsm.sh index 2abf14cb9..0182d24db 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v21.2.0" +version="v21.2.1" shortname="core" gameservername="core" commandname="CORE" diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh index f515375e2..d5a2919ee 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.0" +version="v21.2.1" shortname="fctr" gameservername="fctrserver" commandname="CORE" diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 97a670fc7..792ceb2a6 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.0" +version="v21.2.1" shortname="jc2" gameservername="jc2server" commandname="CORE" diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh index bbc481942..d6006c669 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.0" +version="v21.2.1" shortname="mc" gameservername="mcserver" commandname="CORE" diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh index 5b32cd783..344c9083e 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.0" +version="v21.2.1" shortname="ts3" gameservername="ts3server" commandname="CORE" From dd2ab39170b6a829b2a209e6d2fd1341556d3909 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sun, 14 Mar 2021 17:24:33 +0000 Subject: [PATCH 2/3] Revert "fix(vhserver): add escaped quotes to Valheim startparams to account for spaces (#3272)" (#3370) This reverts commit 8db3b6d48740817eec2c337f6e579c9064ec9e74. Co-authored-by: Brandon --- lgsm/config-default/config-lgsm/vhserver/_default.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/config-default/config-lgsm/vhserver/_default.cfg b/lgsm/config-default/config-lgsm/vhserver/_default.cfg index 818040bd3..096faf2a4 100644 --- a/lgsm/config-default/config-lgsm/vhserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/vhserver/_default.cfg @@ -18,7 +18,7 @@ public="1" savedir="$HOME/.config/unity3d/IronGate/Valheim" ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters -startparameters="-name \"${servername}\" -password \"${serverpassword}\" -port ${port} -world \"${gameworld}\" -public ${public} -savedir \"${savedir}\"" +startparameters="-name '${servername}' -password ${serverpassword} -port ${port} -world ${gameworld} -public ${public} -savedir '${savedir}'" #### LinuxGSM Settings #### From 06e348a2b609eabba8db0b5654b9e9a190b41b15 Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 14 Mar 2021 18:24:50 +0100 Subject: [PATCH 3/3] fix(ts3): regression from #3283 (#3369) --- lgsm/functions/update_ts3.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/update_ts3.sh b/lgsm/functions/update_ts3.sh index 51192a331..782a138d1 100644 --- a/lgsm/functions/update_ts3.sh +++ b/lgsm/functions/update_ts3.sh @@ -103,7 +103,7 @@ fn_update_ts3_localbuild(){ fn_update_ts3_remotebuild(){ # Gets remote build info. - if [ "${ts3arch}" == "x86_64" ]; then + if [ "${ts3arch}" == "amd64" ]; then remotebuild=$(curl -s "https://www.teamspeak.com/versions/server.json" | jq -r '.linux.x86_64.version') elif [ "${ts3arch}" == "x86" ]; then remotebuild=$(curl -s "https://www.teamspeak.com/versions/server.json" | jq -r '.linux.x86.version')