Jelajahi Sumber

Merge branch 'release/v20.3.0' into develop

Daniel Gibbs 6 tahun lalu
induk
melakukan
d1fa709e01

+ 2 - 3
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"

+ 1 - 1
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
 

+ 4 - 1
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	

+ 4 - 1
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	

+ 4 - 1
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	

+ 4 - 1
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

+ 4 - 1
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	

+ 4 - 1
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	

+ 4 - 1
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	

+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
tests/tests_jc2server.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="v20.2.1"
+version="v20.3.0"
 shortname="jc2"
 gameservername="jc2server"
 commandname="CORE"

+ 1 - 1
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"

+ 1 - 1
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"