diff --git a/home.admin/00raspiblitz.sh b/home.admin/00raspiblitz.sh index df352d6..9a2540b 100755 --- a/home.admin/00raspiblitz.sh +++ b/home.admin/00raspiblitz.sh @@ -225,13 +225,12 @@ To run a BACKUP of funds & channels first is recommended. exit fi - else - echo "${network} error: ${clienterror}" fi # let 80scanLND script to the info to use /home/admin/80scanLND.sh if [ $? -gt 0 ]; then + echo "${network} error: ${clienterror}" exit 0 fi diff --git a/home.admin/80scanLND.sh b/home.admin/80scanLND.sh index dd4b1ef..7b73c86 100755 --- a/home.admin/80scanLND.sh +++ b/home.admin/80scanLND.sh @@ -29,9 +29,9 @@ if [ ${bitcoinActive} -eq 0 ]; then echo "*****************************************" echo "If you just started some config/setup, this might be OK." echo - if [ ${#bitcoinError} -gt 0 ]; then + if [ ${#bitcoinErrorFull} -gt 0 ]; then echo "More Error Detail:" - echo ${bitcoinError} + echo ${bitcoinErrorFull} echo fi echo "-> To start ${network}d run: sudo systemctl start ${network}d" @@ -41,9 +41,10 @@ if [ ${bitcoinActive} -eq 0 ]; then exit 1 fi else - infoStr=" The ${network}d service is starting.\n Login for more details:" + height=6 + infoStr=" The ${network}d service is starting.\n${bitcoinErrorShort}\n Login for more details:" if [ "$USER" == "admin" ]; then - infoStr=" The ${network}d service is starting.\n Please wait up to 5min ..." + infoStr=" The ${network}d service is starting.\n${bitcoinErrorShort}\nPlease wait up to 5min ..." fi fi @@ -65,9 +66,9 @@ elif [ ${lndActive} -eq 0 ]; then echo "*********************************" echo "If you just started some config/setup, this might be OK." echo - if [ ${#lndError} -gt 0 ]; then + if [ ${#lndErrorFull} -gt 0 ]; then echo "More Error Detail:" - echo ${lndError} + echo ${lndErrorFull} echo fi echo "-> To start LND run: sudo systemctl start lnd" diff --git a/home.admin/config.scripts/blitz.statusscan.sh b/home.admin/config.scripts/blitz.statusscan.sh index b3951c2..a7064b7 100644 --- a/home.admin/config.scripts/blitz.statusscan.sh +++ b/home.admin/config.scripts/blitz.statusscan.sh @@ -38,10 +38,11 @@ if [ ${bitcoinRunning} -eq 1 ]; then blockchaininfo=$(sudo -u bitcoin ${network}-cli -datadir=/home/bitcoin/.${network} getblockchaininfo 2>/mnt/hdd/temp/.bitcoind.error) # check if error on request - bitcoinError=$(cat /mnt/hdd/temp/.bitcoind.error 2>/dev/null | tr "'" '"' | tr '"' '\"' ) + bitcoinError=$(cat /mnt/hdd/temp/.bitcoind.error 2>/dev/null) rm /mnt/hdd/temp/.bitcoind.error 2>/dev/null if [ ${#bitcoinError} -gt 0 ]; then - echo "bitcoinError='${bitcoinError}'" + echo "bitcoinErrorFull='${bitcoinError}'" + echo "bitcoinErrorShort='${clienterror/error*:/}'" else ############################## @@ -77,10 +78,11 @@ if [ ${lndRunning} -eq 1 ]; then lndinfo=$(sudo -u bitcoin lncli getinfo 2>/mnt/hdd/temp/.lnd.error) # check if error on request - lndError=$(cat /mnt/hdd/temp/.lnd.error 2>/dev/null | tr "'" '"' | tr '"' '\"' ) + lndErrorFull=$(cat /mnt/hdd/temp/.lnd.error 2>/dev/null) rm /mnt/hdd/temp/.lnd.error 2>/dev/null if [ ${#lndError} -gt 0 ]; then - echo "lndError='${lndError}'" + echo "lndErrorFull='${lndErrorFull}'" + echo "lndErrorShort=''" else # synced to chain