bugfix(webi): printf rather than echo -e for colors for certain shells

[webi-installers/.git] / _webi / template.sh

diff --git a/_webi/template.sh b/_webi/template.sh
index 2fff9361c76c728eeb5a2541edf1baedd62d068f..01a9e3a4cec6e06f8debbaaf4001b34bbfa3d85a 100644 (file)
--- a/_webi/template.sh
+++ b/_webi/template.sh
@@ -35,6 +35,7 @@ function __bootstrap_webi() {
     #PKG_ARCHES=
     #PKG_FORMATS=
     WEBI_UA="$(uname -a)"
+    WEBI_PKG_DOWNLOAD=""
     export WEBI_HOST
 
     ##
@@ -152,6 +153,9 @@ function __bootstrap_webi() {
             my_dl="$HOME/Downloads/$WEBI_PKG_FILE"
         fi
 
+        WEBI_PKG_DOWNLOAD="${my_dl}"
+        export WEBI_PKG_DOWNLOAD
+
         if [ -e "$my_dl" ]; then
             echo "Found $my_dl"
             return 0
@@ -170,7 +174,7 @@ function __bootstrap_webi() {
             if [[ $- == *i* ]]; then
                 my_show_progress="--show-progress"
             fi
-            if wget -q $my_show_progress --user-agent="wget $WEBI_UA" -c "$my_url" -O "$my_dl.part"; then
+            if ! wget -q $my_show_progress --user-agent="wget $WEBI_UA" -c "$my_url" -O "$my_dl.part"; then
                 echo >&2 "failed to download from $WEBI_PKG_URL"
                 exit 1
             fi
@@ -301,9 +305,12 @@ function __bootstrap_webi() {
 
     if [[ -z ${WEBI_WELCOME:-} ]]; then
         echo ""
-        echo "Thanks for using webi to install '$PKG_NAME' on '$WEBI_OS/$WEBI_ARCH'."
+        printf "Thanks for using webi to install '\e[32m${WEBI_PKG:-}\e[0m' on '\e[31m$(uname -s)/$(uname -m)\e[0m'.\n"
         echo "Have a problem? Experience a bug? Please let us know:"
-        echo "        https://github.com/webinstall/packages/issues"
+        echo "        https://github.com/webinstall/webi-installers/issues"
+        echo ""
+        printf "\e[31mLovin'\e[0m it? Say thanks with a \e[34mStar on GitHub\e[0m:\n"
+        printf "        \e[32mhttps://github.com/webinstall/webi-installers\e[0m\n"
         echo ""
     fi