Kaynağa Gözat

Merge branch 'release/v20.1.0' into develop

Daniel Gibbs 6 yıl önce
ebeveyn
işleme
1347695428

+ 4 - 4
lgsm/config-default/config-lgsm/dstserver/_default.cfg

@@ -153,14 +153,14 @@ glibc="2.15"
 systemdir="${serverfiles}"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}/bin"
 executabledir="${serverfiles}/bin"
 executable="./dontstarve_dedicated_server_nullrenderer"
 executable="./dontstarve_dedicated_server_nullrenderer"
-servercfgdir="${clustercfgdir}/${shard}"
-servercfg="server.ini"
-servercfgdefault="server.ini"
-servercfgfullpath="${servercfgdir}/${servercfg}"
 clustercfgdir="${persistentstorageroot}/${confdir}/${cluster}"
 clustercfgdir="${persistentstorageroot}/${confdir}/${cluster}"
 clustercfg="cluster.ini"
 clustercfg="cluster.ini"
 clustercfgdefault="cluster.ini"
 clustercfgdefault="cluster.ini"
 clustercfgfullpath="${clustercfgdir}/${clustercfg}"
 clustercfgfullpath="${clustercfgdir}/${clustercfg}"
+servercfgdir="${clustercfgdir}/${shard}"
+servercfg="server.ini"
+servercfgdefault="server.ini"
+servercfgfullpath="${servercfgdir}/${servercfg}"
 
 
 ## Backup Directory
 ## Backup Directory
 backupdir="${lgsmdir}/backup"
 backupdir="${lgsmdir}/backup"

+ 1 - 1
lgsm/functions/check_steamcmd.sh

@@ -55,7 +55,7 @@ fn_check_steamcmd(){
 			fn_install_steamcmd
 			fn_install_steamcmd
 		fi
 		fi
 	elif [ "${function_selfname}" == "command_install.sh" ]; then
 	elif [ "${function_selfname}" == "command_install.sh" ]; then
-		fn_print_information "SteamCMD is already installed"
+		fn_print_information "SteamCMD is already installed..."
 		fn_print_ok_eol_nl
 		fn_print_ok_eol_nl
 	fi
 	fi
 }
 }

+ 1 - 1
linuxgsm.sh

@@ -20,7 +20,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 	set -x
 fi
 fi
 
 
-version="v19.12.5"
+version="v20.1.0"
 shortname="core"
 shortname="core"
 gameservername="core"
 gameservername="core"
 rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 rootdir=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")