From 5808a3d99daf865e7e0b88bdc3db99bf2be62326 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 2 Dec 2019 21:09:34 +0000 Subject: [PATCH] fix(core-dl): adjust unzip options and revert curl changes --- lgsm/functions/core_dl.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lgsm/functions/core_dl.sh b/lgsm/functions/core_dl.sh index 84768bebb..24cff68bf 100644 --- 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