From: AJ ONeal <aj@therootcompany.com>
Date: Thu, 19 Nov 2020 04:51:34 +0000 (+0000)
Subject: don't show progress for non-interactive sessions
X-Git-Url: https://git.josue.xyz/?a=commitdiff_plain;h=5927fa9041052f51be3f2598623eb0c6c95b909f;p=webi-installers%2F.git

don't show progress for non-interactive sessions
---

diff --git a/_webi/template.sh b/_webi/template.sh
index a041e41..643be6c 100644
--- a/_webi/template.sh
+++ b/_webi/template.sh
@@ -156,7 +156,11 @@ webi_download() {
         # wget has resumable downloads
         # TODO wget -c --content-disposition "$my_url"
         set +e
-        wget -q --show-progress --user-agent="wget $WEBI_UA" -c "$my_url" -O "$my_dl.part"
+        my_show_progress=""
+        if [[ $- == *i* ]]; then
+          my_show_progress="--show-progress"
+        fi
+        wget -q $my_show_progress --user-agent="wget $WEBI_UA" -c "$my_url" -O "$my_dl.part"
         if ! [ $? -eq 0 ]; then
           >&2 echo "failed to download from $WEBI_PKG_URL"
           exit 1
@@ -165,7 +169,11 @@ webi_download() {
     else
         # Neither GNU nor BSD curl have sane resume download options, hence we don't bother
         # TODO curl -fsSL --remote-name --remote-header-name --write-out "$my_url"
-        curl -fSL -H "User-Agent: curl $WEBI_UA" "$my_url" -o "$my_dl.part"
+        my_show_progress="-#"
+        if [[ $- == *i* ]]; then
+          my_show_progress=""
+        fi
+        curl -fSL $my_show_progress -H "User-Agent: curl $WEBI_UA" "$my_url" -o "$my_dl.part"
     fi
     mv "$my_dl.part" "$my_dl"