From 13b3acbb4518871bb9b3bfa2c0742b733e525e41 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 20 May 2020 13:31:01 +0100 Subject: [PATCH 1/4] release v20.3.0 --- 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 a5e1cce44..ae1b860a7 100644 --- 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.2.1" +modulesversion="v20.3.0" # Core diff --git a/linuxgsm.sh b/linuxgsm.sh index f4b8c8607..eaa2b31b7 100755 --- a/linuxgsm.sh +++ b/linuxgsm.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v20.2.1" +version="v20.3.0" shortname="core" gameservername="core" commandname="CORE" diff --git a/tests/tests_fctrserver.sh b/tests/tests_fctrserver.sh index 4bee74eae..50f2a1b15 100644 --- a/tests/tests_fctrserver.sh +++ b/tests/tests_fctrserver.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v20.2.1" +version="v20.3.0" shortname="fctr" gameservername="fctrserver" commandname="CORE" diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 1cc6143cb..831b3a549 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v20.2.1" +version="v20.2.0" shortname="jc2" gameservername="jc2server" commandname="CORE" diff --git a/tests/tests_mcserver.sh b/tests/tests_mcserver.sh index 2138b8faf..8c3c6c267 100644 --- a/tests/tests_mcserver.sh +++ b/tests/tests_mcserver.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v20.2.1" +version="v20.3.0" shortname="mc" gameservername="mcserver" commandname="CORE" diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh index 6f393ad84..6b398364b 100644 --- a/tests/tests_ts3server.sh +++ b/tests/tests_ts3server.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v20.2.1" +version="v20.3.0" shortname="ts3" gameservername="ts3server" commandname="CORE" From 57c7156d32e2ddfe2322a895e0440faccba3694a Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 20 May 2020 14:25:36 +0100 Subject: [PATCH 2/4] release v30.3.0 --- tests/tests_jc2server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh index 831b3a549..61793bca0 100644 --- a/tests/tests_jc2server.sh +++ b/tests/tests_jc2server.sh @@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="v20.2.0" +version="v20.3.0" shortname="jc2" gameservername="jc2server" commandname="CORE" From 95ce894f10b1d84c88c48ee6504eed4644978653 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 20 May 2020 15:39:35 +0100 Subject: [PATCH 3/4] fix resolving update not running on install (#2893) --- lgsm/functions/update_factorio.sh | 5 ++++- lgsm/functions/update_minecraft.sh | 5 ++++- lgsm/functions/update_minecraft_bedrock.sh | 5 ++++- lgsm/functions/update_mta.sh | 5 ++++- lgsm/functions/update_mumble.sh | 5 ++++- lgsm/functions/update_steamcmd.sh | 5 ++++- lgsm/functions/update_ts3.sh | 5 ++++- 7 files changed, 28 insertions(+), 7 deletions(-) diff --git a/lgsm/functions/update_factorio.sh b/lgsm/functions/update_factorio.sh index f7436d58d..7d12c0f58 100644 --- a/lgsm/functions/update_factorio.sh +++ b/lgsm/functions/update_factorio.sh @@ -170,4 +170,7 @@ else fn_update_factorio_remotebuild fn_update_factorio_compare fi -core_exit.sh + +if [ "${commandname}" != "INSTALL" ]; then + core_exit.sh +fi diff --git a/lgsm/functions/update_minecraft.sh b/lgsm/functions/update_minecraft.sh index 8a81e0ad6..8741db01d 100644 --- a/lgsm/functions/update_minecraft.sh +++ b/lgsm/functions/update_minecraft.sh @@ -218,4 +218,7 @@ else fn_update_minecraft_remotebuild fn_update_minecraft_compare fi -core_exit.sh + +if [ "${commandname}" != "INSTALL" ]; then + core_exit.sh +fi diff --git a/lgsm/functions/update_minecraft_bedrock.sh b/lgsm/functions/update_minecraft_bedrock.sh index e439adcb5..b560f3672 100644 --- a/lgsm/functions/update_minecraft_bedrock.sh +++ b/lgsm/functions/update_minecraft_bedrock.sh @@ -178,4 +178,7 @@ else fn_update_minecraft_remotebuild fn_update_minecraft_compare fi -core_exit.sh + +if [ "${commandname}" != "INSTALL" ]; then + core_exit.sh +fi diff --git a/lgsm/functions/update_mta.sh b/lgsm/functions/update_mta.sh index c8fad55ea..c37c5ba81 100644 --- a/lgsm/functions/update_mta.sh +++ b/lgsm/functions/update_mta.sh @@ -209,4 +209,7 @@ else fn_update_mta_remotebuild fn_update_mta_compare fi -core_exit.sh + +if [ "${commandname}" != "INSTALL" ]; then + core_exit.sh +fi diff --git a/lgsm/functions/update_mumble.sh b/lgsm/functions/update_mumble.sh index 9fe9e2596..00fbade5e 100644 --- a/lgsm/functions/update_mumble.sh +++ b/lgsm/functions/update_mumble.sh @@ -148,4 +148,7 @@ else fn_update_mumble_remotebuild fn_update_mumble_compare fi -core_exit.sh + +if [ "${commandname}" != "INSTALL" ]; then + core_exit.sh +fi diff --git a/lgsm/functions/update_steamcmd.sh b/lgsm/functions/update_steamcmd.sh index b22569d1a..e7d018d19 100644 --- a/lgsm/functions/update_steamcmd.sh +++ b/lgsm/functions/update_steamcmd.sh @@ -246,4 +246,7 @@ else fn_update_steamcmd_remotebuild fn_update_steamcmd_compare fi -core_exit.sh + +if [ "${commandname}" != "INSTALL" ]; then + core_exit.sh +fi diff --git a/lgsm/functions/update_ts3.sh b/lgsm/functions/update_ts3.sh index 87c8a86da..ec921b3f0 100644 --- a/lgsm/functions/update_ts3.sh +++ b/lgsm/functions/update_ts3.sh @@ -219,4 +219,7 @@ else fn_update_ts3_remotebuild fn_update_ts3_compare fi -core_exit.sh + +if [ "${commandname}" != "INSTALL" ]; then + core_exit.sh +fi From f05eab26330150891ae2b412c5baf2970744e9bb Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 20 May 2020 17:42:04 +0100 Subject: [PATCH 4/4] feat(avorion): remove avgalaxy variable and replace with selfname --- lgsm/config-default/config-lgsm/avserver/_default.cfg | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lgsm/config-default/config-lgsm/avserver/_default.cfg b/lgsm/config-default/config-lgsm/avserver/_default.cfg index 4b53d68d2..f4f430e16 100644 --- a/lgsm/config-default/config-lgsm/avserver/_default.cfg +++ b/lgsm/config-default/config-lgsm/avserver/_default.cfg @@ -11,14 +11,13 @@ port="27000" # https://steamidfinder.com adminsteamid="" -avgalaxy="avgalaxy" ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters fn_parms(){ if [ ! -z "${adminsteamid}" ]; then admincmd="--admin ${adminsteamid}" fi -parms="--galaxy-name ${avgalaxy} --ip ${ip} --datapath ${avdatapath} ${admincmd}" +parms="--galaxy-name ${selfname} --ip ${ip} --datapath ${avdatapath} ${admincmd}" } #### LinuxGSM Settings #### @@ -146,7 +145,7 @@ glibc="2.15" ## Game Server Directories avdatapath="${serverfiles}/galaxy" -avgalaxypath="${avdatapath}/${avgalaxy}" +avgalaxypath="${avdatapath}/${selfname}" systemdir="${serverfiles}" executabledir="${systemdir}" executable="./server.sh"