diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh index d4efb4c..650acd8 100755 --- a/home.admin/00infoLCD.sh +++ b/home.admin/00infoLCD.sh @@ -197,24 +197,6 @@ while : continue fi - # check if bitcoin is ready - #sudo -u bitcoin ${network}-cli -datadir=/home/bitcoin/.${network} getblockchaininfo 1>/dev/null 2>error.tmp - #clienterror=`cat error.tmp` - #rm error.tmp - #if [ ${#clienterror} -gt 0 ]; then - # boxwidth=40 - # l1="Waiting for ${network}d to get ready.\n" - # l2="---> ${clienterror/error*:/}\n" - # l3="Can take longer if device was off." - # uptimeSeconds="$(cat /proc/uptime | grep -o '^[0-9]\+')" - # if [ ${uptimeSeconds} -gt 600 ]; then - # l3="!!Please login for more details!!" - # fi - # dialog --backtitle "RaspiBlitz ${codeVersion} (${localip}) - Welcome Back" --infobox "$l1$l2$l3" 5 ${boxwidth} - # sleep 5 - # continue - #fi - # check if locked locked=$(sudo -u bitcoin lncli --chain=${network} --network=${chain}net getinfo 2>&1 | grep -c unlock) if [ "${locked}" -gt 0 ]; then diff --git a/home.admin/80scanLND.sh b/home.admin/80scanLND.sh index 7b73c86..376b129 100755 --- a/home.admin/80scanLND.sh +++ b/home.admin/80scanLND.sh @@ -11,7 +11,7 @@ if [ "$USER" == "admin" ]; then adminStr="Use CTRL+c to EXIT to Terminal" fi -if [ ${bitcoinActive} -eq 0 ]; then +if [ ${bitcoinActive} -eq 0 ] || [ ${#bitcoinErrorFull} -gt 0 ]; then #################### # On Bitcoin Error @@ -48,7 +48,7 @@ if [ ${bitcoinActive} -eq 0 ]; then fi fi -elif [ ${lndActive} -eq 0 ]; then +elif [ ${lndActive} -eq 0 ] || [ ${#lndErrorFull} -gt 0 ]; then #################### # On LND Error diff --git a/home.admin/config.scripts/blitz.statusscan.sh b/home.admin/config.scripts/blitz.statusscan.sh index fe0e7d9..3607051 100644 --- a/home.admin/config.scripts/blitz.statusscan.sh +++ b/home.admin/config.scripts/blitz.statusscan.sh @@ -42,7 +42,8 @@ if [ ${bitcoinRunning} -eq 1 ]; then #rm /mnt/hdd/temp/.bitcoind.error 2>/dev/null if [ ${#bitcoinError} -gt 0 ]; then echo "bitcoinErrorFull='${bitcoinError}'" - echo "bitcoinErrorShort='${bitcoinError/error*:/}'" + bitcoinErrorShort=$(echo ${bitcoinError/error*:/} | sed 's/[^a-zA-Z0-9 ]//g') + echo "bitcoinErrorShort='${bitcoinErrorShort}'" else ##############################