Merge branch 'hotfix/v19.12.4'

GameServerManagers · Dec 2, 2019 · d36b7cc · d36b7cc
2 parents b0c623f + 715367e
commit d36b7cc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git 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"

diff --git 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

diff --git 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

diff --git 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

diff --git 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]}")")