From 6e3faa164cf44728a8ad73918e27c01b2799de22 Mon Sep 17 00:00:00 2001 From: Christian Rotzoll Date: Tue, 16 Apr 2019 23:02:21 +0100 Subject: [PATCH] break loop on error --- home.admin/00raspiblitz.sh | 3 +++ home.admin/80scanLND.sh | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/home.admin/00raspiblitz.sh b/home.admin/00raspiblitz.sh index 8442104..e7d2377 100755 --- a/home.admin/00raspiblitz.sh +++ b/home.admin/00raspiblitz.sh @@ -251,6 +251,9 @@ To run a BACKUP of funds & channels first is recommended. lndSynced=$(sudo -u bitcoin /usr/local/bin/lncli --chain=${network} --network=${chain}net getinfo 2>/dev/null | jq -r '.synced_to_chain' | grep -c true) if [ ${lndSynced} -eq 0 ]; then /home/admin/80scanLND.sh + if [ $? -gt 0 ]; then + exit 0 + fi else # everything is ready - return from loop return diff --git a/home.admin/80scanLND.sh b/home.admin/80scanLND.sh index e2c9b7f..925b401 100755 --- a/home.admin/80scanLND.sh +++ b/home.admin/80scanLND.sh @@ -20,7 +20,7 @@ if [ ${bitcoinActive} -eq 0 ]; then height=6 width=42 title="Blockchain Warning" - infoStr=" The ${network}d service is not running.\n Login for more details." + infoStr=" The ${network}d service is not running.\n Login for more details:" if [ "$USER" == "admin" ]; then infoStr="${infoStr}\n${bitcoinError}" fi @@ -34,7 +34,7 @@ elif [ ${lndActive} -eq 0 ]; then height=5 width=42 title="Lightning Warning" - infoStr=" The lnd service is not running.\n Login for more details." + infoStr=" The lnd service is not running.\n Login for more details:" if [ "$USER" == "admin" ]; then clear echo "*********************************" @@ -43,7 +43,7 @@ elif [ ${lndActive} -eq 0 ]; then echo ${lndError} echo "Use following command to debug:" echo "/home/admin/XXdebugLogs.sh" - exit 0 + exit 1 fi else