From c6396b8b46495703b85fc2be6d8825e336b34d5c Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 1 Feb 2022 21:53:57 -0500 Subject: [PATCH] Update npm_setup.sh --- setup/npm_setup.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/setup/npm_setup.sh b/setup/npm_setup.sh index 74bd42f1..16838fee 100644 --- a/setup/npm_setup.sh +++ b/setup/npm_setup.sh @@ -6,8 +6,11 @@ set -o nounset set -o pipefail shopt -s expand_aliases alias die='EXIT=$? LINE=$LINENO error_exit' -CHECKMARK='\033[0;32m\xE2\x9C\x94\033[0m' CROSS='\033[1;31m\xE2\x9D\x8C\033[0m' +CHECKMARK='\033[0;32m\xE2\x9C\x94\033[0m' +RETRY_NUM=5 +RETRY_EVERY=3 +NUM=$RETRY_NUM trap die ERR trap 'die "Script interrupted."' INT @@ -26,12 +29,18 @@ function msg() { echo -e "${CHECKMARK} \e[1;92m Setting up Container OS... \e[0m" sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen locale-gen >/dev/null -sleep 3 while [ "$(hostname -I)" = "" ]; do - echo -e "${CROSS} \e[1;31m No network: \e[0m $(date)" - sleep 3 + 1>&2 echo -e "${CROSS} \e[1;31m No Network: \e[0m $(date)" + sleep $RETRY_EVERY + ((NUM--)) + if [ $NUM -eq 0 ] + then + 1>&2 echo -e "${CROSS} \e[1;31m No Network After $RETRY_NUM Tries \e[0m" + exit 1 + fi done - echo -e "${CHECKMARK} \e[1;92m Network connected: \e[0m $(hostname -I)" + echo -e "${CHECKMARK} \e[1;92m Network Connected: \e[0m $(hostname -I)" + echo -e "${CHECKMARK} \e[1;92m Updating Container OS... \e[0m" apt update &>/dev/null apt-get -qqy upgrade &>/dev/null