mtan93/Installomator
1
0
Fork 0
mirror of https://github.com/mtan93/Installomator.git synced 2026-03-30 14:23:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed variable names to match standards

Browse Source
This commit is contained in:
Armin Briegel
2022-07-29 15:20:22 +02:00
parent dfe9860848
commit ef3113a05f
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fragments/main.sh
View File

@@ -195,21 +195,23 @@ else
fi
fi
if [[ $SHOWPROGRESS == "yes" ]]; then
if [[ $DIALOG_PROGRESS == "yes" ]]; then
# pipe
pipe="/tmp/dlpipe"
# initialise named pipe for curl output
initNamedPipe create $pipe
# run the pipe read in the background
readDownloadPipe $pipe "$DIALOGCMDFILE" &
downloadPipePID=$!
readDownloadPipe $pipe "$DIALOGCMDFILE" & downloadPipePID=$!
# TODO: this should _not_ be part of Installomator.
# Also there should be a check if DIALOG_PROGRESS is set but dialog is not installed
# launch dialog
launchDialog "$name" "$DIALOGCMDFILE" &
# curl (extract - line in "# MARK: download the archive" of Installomator.sh)
curlDownload=$(curl -fL -# --show-error "$downloadURL" -o "$archiveName" 2>&1 | tee $pipe)
curlDownload=$(curl -fL -# --show-error ${curlOptions} "$downloadURL" -o "$archiveName" 2>&1 | tee $pipe)
# because we are tee-ing the output, we want the pipe status of the first command in the chain, not the most recent one
curlDownloadStatus=$(echo $pipestatus[1])
killProcess $downloadPipePID
@@ -220,7 +222,7 @@ else
curlDownload=$(curl -v -fsL --show-error ${curlOptions} "$downloadURL" -o "$archiveName" 2>&1)
curlDownloadStatus=$(echo $?)
fi
deduplicatelogs "$curlDownload"
if [[ $curlDownloadStatus -ne 0 ]]; then
#if ! curl --location --fail --silent "$downloadURL" -o "$archiveName"; then