From 65591d6aaef6ed80a39c8c5ee8a90444dcd31f51 Mon Sep 17 00:00:00 2001 From: rootzoll Date: Fri, 24 Aug 2018 00:11:33 +0200 Subject: [PATCH] better info during scanning --- home.admin/70initLND.sh | 4 ++-- home.admin/80scanLND.sh | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/home.admin/70initLND.sh b/home.admin/70initLND.sh index 98cbc8149..e6f5114f1 100755 --- a/home.admin/70initLND.sh +++ b/home.admin/70initLND.sh @@ -201,7 +201,7 @@ fi echo "" echo "*** Check LND Sync ***" item=0 -lndSyncing=$(sudo -u bitcoin /usr/local/bin/lncli getinfo | jq -r '.synced_to_chain' | grep -c true) +lndSyncing=$(sudo -u bitcoin /usr/local/bin/lncli getinfo 2>/dev/null | jq -r '.synced_to_chain' | grep -c true) if [ ${lndSyncing} -eq 0 ]; then echo "OK - wait for LND to be synced" while : @@ -212,7 +212,7 @@ if [ ${lndSyncing} -eq 0 ]; then sleep 3 # break loop when synced - lndSyncing=$(sudo -u bitcoin /usr/local/bin/lncli getinfo | jq -r '.synced_to_chain' | grep -c true) + lndSyncing=$(sudo -u bitcoin /usr/local/bin/lncli getinfo 2>/dev/null | jq -r '.synced_to_chain' | grep -c true) if [ ${lndSyncing} -eq 1 ]; then break fi diff --git a/home.admin/80scanLND.sh b/home.admin/80scanLND.sh index b2bfee415..db4904609 100755 --- a/home.admin/80scanLND.sh +++ b/home.admin/80scanLND.sh @@ -1,6 +1,9 @@ # load network network=`sudo cat /home/admin/.network` +# load name of Blitz +name=`sudo cat /home/admin/.hostname` + ### USER PI AUTOSTART (LCD Display) localip=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1 -d'/') @@ -22,7 +25,10 @@ if [ ${percent} -eq 100 ]; then percent=0 fi -infoStr=$(echo " Lightning Rescanning Blockchain ${percent}%\nplease wait - this can take some time") +infoStr=$(echo " Lightning Rescanning Blockchain ${percent}%\nplease wait - this can take some time\nssh admin@${localip}\nPassword A") +if [ "$USER" = "admin" ]; then + infoStr=$(echo " Lightning Rescanning Blockchain ${percent}%\nplease wait - this can take some time\nIts OK to close terminal and ssh back in later.") +fi # check if blockchain is still syncing isWaitingBlockchain=$( sudo -u bitcoin tail -n 2 /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log | grep "Waiting for chain backend to finish sync" -c ) @@ -32,4 +38,4 @@ fi # display progress to user sleep 1 -dialog --backtitle "RaspiBlitz (${localip} / ${network} / ${chain})" --infobox "${infoStr}" 4 42 \ No newline at end of file +dialog --title "${name}" --backtitle "RaspiBlitz (${localip} / ${network} / ${chain})" --infobox "${infoStr}" 4 42 \ No newline at end of file