From d888ca37f3a96376ed2a8fec39b6e9e59d240d34 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 1 Dec 2019 16:24:36 +0000
Subject: [PATCH 1/4] feat(core-dl): improve resilience of large downloads

---
 lgsm/functions/command_monitor.sh         | 2 +-
 lgsm/functions/command_update_linuxgsm.sh | 3 +--
 lgsm/functions/core_dl.sh                 | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh
index 387bd8b1c..d1b075efe 100644
--- a/lgsm/functions/command_monitor.sh
+++ b/lgsm/functions/command_monitor.sh
@@ -19,7 +19,7 @@ fn_monitor_check_lockfile(){
 		fn_sleep_time
 		fn_print_error "Checking lockfile: No lockfile found: "
 		fn_print_error_eol
-		fn_script_log_error "Checking lockfile: No lockfile found: ERROR"
+		fn_script_log_error_nl "Checking lockfile: No lockfile found: ERROR"
 		fn_sleep_time
 		echo -e "	* Start ${selfname} to run monitor."
 		core_exit.sh
diff --git a/lgsm/functions/command_update_linuxgsm.sh b/lgsm/functions/command_update_linuxgsm.sh
index 6816a1443..c9ff2f248 100644
--- a/lgsm/functions/command_update_linuxgsm.sh
+++ b/lgsm/functions/command_update_linuxgsm.sh
@@ -56,12 +56,11 @@ 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}"
-
+		exitcode=$?
 		if [ "${exitcode}" == "0" ]; then
 			fn_print_fail_eol_nl
 			core_exit.sh
diff --git a/lgsm/functions/core_dl.sh b/lgsm/functions/core_dl.sh
index 0e215356a..84768bebb 100644
--- a/lgsm/functions/core_dl.sh
+++ b/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

From 42c7f7a6557726fea8ce5c042a26a9a2bed04693 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 1 Dec 2019 16:27:56 +0000
Subject: [PATCH 2/4] feat(core-dl): improve resilience of large downloads

feat(core-dl): improve resilience of large downloads
---
 lgsm/functions/command_monitor.sh         | 2 +-
 lgsm/functions/command_update_linuxgsm.sh | 5 ++---
 lgsm/functions/core_dl.sh                 | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh
index 387bd8b1c..d1b075efe 100644
--- a/lgsm/functions/command_monitor.sh
+++ b/lgsm/functions/command_monitor.sh
@@ -19,7 +19,7 @@ fn_monitor_check_lockfile(){
 		fn_sleep_time
 		fn_print_error "Checking lockfile: No lockfile found: "
 		fn_print_error_eol
-		fn_script_log_error "Checking lockfile: No lockfile found: ERROR"
+		fn_script_log_error_nl "Checking lockfile: No lockfile found: ERROR"
 		fn_sleep_time
 		echo -e "	* Start ${selfname} to run monitor."
 		core_exit.sh
diff --git a/lgsm/functions/command_update_linuxgsm.sh b/lgsm/functions/command_update_linuxgsm.sh
index 6816a1443..05069b79c 100644
--- a/lgsm/functions/command_update_linuxgsm.sh
+++ b/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
diff --git a/lgsm/functions/core_dl.sh b/lgsm/functions/core_dl.sh
index 0e215356a..84768bebb 100644
--- a/lgsm/functions/core_dl.sh
+++ b/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

From 9eb0b7a6c779f321bb0fb666e225cfa176a81a66 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 1 Dec 2019 19:50:54 +0000
Subject: [PATCH 3/4] release v19.12.3

---
 linuxgsm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linuxgsm.sh b/linuxgsm.sh
index e6a50fb88..556cb2e53 100755
--- a/linuxgsm.sh
+++ b/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]}")")

From f4078ebe1ecbb322441892209f5146041132ea78 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 1 Dec 2019 20:05:03 +0000
Subject: [PATCH 4/4] move nl to correct place

---
 lgsm/functions/command_monitor.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh
index d1b075efe..c3147b975 100644
--- a/lgsm/functions/command_monitor.sh
+++ b/lgsm/functions/command_monitor.sh
@@ -18,8 +18,8 @@ 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_script_log_error_nl "Checking lockfile: No lockfile found: ERROR"
+		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."
 		core_exit.sh