From 9974a8ab470607692f117827e4320e913ae6cd50 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Thu, 28 Jun 2018 15:48:12 -0600 Subject: [PATCH] more awesome progress --- usr/share/install_helper.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/usr/share/install_helper.sh b/usr/share/install_helper.sh index 6172783..dfa10b2 100644 --- a/usr/share/install_helper.sh +++ b/usr/share/install_helper.sh @@ -144,8 +144,10 @@ if [ -n "${TELEBIT_DEBUG}" ]; then echo " - installing node.js runtime to '$TELEBIT_REAL_PATH'..." http_bash https://git.coolaj86.com/coolaj86/node-installer.sh/raw/branch/master/install.sh --no-dev-deps else - echo -n "." + bash -c 'while true; do echo -n "."; sleep 2; done' & + _my_pid=$! http_bash https://git.coolaj86.com/coolaj86/node-installer.sh/raw/branch/master/install.sh --no-dev-deps >/dev/null 2>/dev/null + kill -9 $_my_pid >/dev/null 2>/dev/null fi # @@ -167,11 +169,12 @@ my_tar=$(type -p tar) if [ -n "$my_unzip" ]; then rm -f $my_tmp/$my_app-$TELEBIT_VERSION.zip if [ -n "${TELEBIT_DEBUG}" ]; then - echo " - installing telebit zip to '$TELEBIT_REAL_PATH'..." - else - echo -n "." + echo " - installing telebit zip to '$TELEBIT_REAL_PATH'" fi + bash -c 'while true; do echo -n "."; sleep 2; done' & + _my_pid=$! http_get https://git.coolaj86.com/coolaj86/$my_repo/archive/$TELEBIT_VERSION.zip $my_tmp/$my_app-$TELEBIT_VERSION.zip + kill -9 $_my_pid >/dev/null 2>/dev/null # -o means overwrite, and there is no option to strip $my_unzip -o $my_tmp/$my_app-$TELEBIT_VERSION.zip -d $my_tmp/ >/dev/null $rsync_cmd $my_tmp/$my_repo/* $TELEBIT_TMP/ > /dev/null @@ -179,11 +182,12 @@ if [ -n "$my_unzip" ]; then elif [ -n "$my_tar" ]; then rm -f $my_tmp/$my_app-$TELEBIT_VERSION.tar.gz if [ -n "${TELEBIT_DEBUG}" ]; then - echo " - installing telebit tar.gz to '$TELEBIT_REAL_PATH'..." - else - echo -n "." + echo " - installing telebit tar.gz to '$TELEBIT_REAL_PATH'" fi + bash -c 'while true; do echo -n "."; sleep 2; done' & + _my_pid=$! http_get https://git.coolaj86.com/coolaj86/$my_repo/archive/$TELEBIT_VERSION.tar.gz $my_tmp/$my_app-$TELEBIT_VERSION.tar.gz + kill -9 $_my_pid >/dev/null 2>/dev/null $my_tar -xzf $my_tmp/$my_app-$TELEBIT_VERSION.tar.gz --strip 1 -C $TELEBIT_TMP/ >/dev/null else echo "Neither tar nor unzip found. Abort."