Răsfoiți Sursa

Merge branch 'hotfix/v19.12.3'

Daniel Gibbs 6 ani în urmă
părinte
comite
cba505a6e6

+ 1 - 1
lgsm/functions/command_monitor.sh

@@ -18,7 +18,7 @@ fn_monitor_check_lockfile(){
 		fn_script_log_info "Checking lockfile: CHECKING"
 		fn_sleep_time
 		fn_print_error "Checking lockfile: No lockfile found: "
-		fn_print_error_eol
+		fn_print_error_eol_nl
 		fn_script_log_error "Checking lockfile: No lockfile found: ERROR"
 		fn_sleep_time
 		echo -e "	* Start ${selfname} to run monitor."

+ 2 - 3
lgsm/functions/command_update_linuxgsm.sh

@@ -56,13 +56,12 @@ if [ -z "${legacymode}" ]; then
 			echo -e "	Backup: ${backupdir}/script/${selfname}-$(date +"%m_%d_%Y_%M").bak"
 		fi
 		echo -en "    fetching ${selfname}...\c"
-		exitcode=$?
 		cp "${tmpdir}/linuxgsm.sh" "${rootdir}/${selfname}"
 		sed -i "s/shortname=\"core\"/shortname=\"${shortname}\"/g" "${rootdir}/${selfname}"
 		sed -i "s/gameservername=\"core\"/gameservername=\"${gameservername}\"/g" "${rootdir}/${selfname}"
 		sed -i "s/gamename=\"core\"/gamename=\"${gamename}\"/g" "${rootdir}/${selfname}"
-
-		if [ "${exitcode}" == "0" ]; then
+		exitcode=$?
+		if [ "${exitcode}" != "0" ]; then
 			fn_print_fail_eol_nl
 			core_exit.sh
 		else

+ 2 - 2
lgsm/functions/core_dl.sh

@@ -133,11 +133,11 @@ fn_fetch_file(){
 			echo -en "downloading ${local_filename}..."
 			fn_sleep_time
 			echo -en "\033[1K"
-			curlcmd=$(curl --progress-bar --fail -L -o "${local_filedir}/${local_filename}" "${remote_fileurl}")
+			curlcmd=$(curl --progress-bar --retry 10 --retry-delay 3 --fail -L -C - -o "${local_filedir}/${local_filename}" "${remote_fileurl}")
 			echo -en "downloading ${local_filename}..."
 		else
 			echo -en "    fetching ${local_filename}...\c"
-			curlcmd=$(curl -s --fail -L -o "${local_filedir}/${local_filename}" "${remote_fileurl}" 2>&1)
+			curlcmd=$(curl -s --retry 3 --retry-delay 3 --fail -L -C - -o "${local_filedir}/${local_filename}" "${remote_fileurl}" 2>&1)
 		fi
 		local exitcode=$?
 		if [ ${exitcode} -ne 0 ]; then

+ 1 - 1
linuxgsm.sh

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