Browse Source
fix(core-dl): adjust unzip options and revert curl changes
pull/2641/head
Daniel Gibbs
5 years ago
No known key found for this signature in database
GPG Key ID: E50EE233189485E3
1 changed files with
3 additions and
3 deletions
-
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 |
|
|
|
|
