From 8f93f8d079994a3eb814d39199eb998faf31a6ba Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Wed, 16 Jan 2019 21:17:44 +0100
Subject: [PATCH] waiting bars and remove old code

---
 home.admin/10setupBlitz.sh |  2 +-
 home.admin/70initLND.sh    | 41 +++-----------------------------------
 2 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/home.admin/10setupBlitz.sh b/home.admin/10setupBlitz.sh
index b579fb6..6116e6d 100755
--- a/home.admin/10setupBlitz.sh
+++ b/home.admin/10setupBlitz.sh
@@ -213,7 +213,7 @@ fi
 # the HDD is already ext4 formated and called blockchain
 formatExt4OK=$(lsblk -o UUID,NAME,FSTYPE,SIZE,LABEL,MODEL | grep BLOCKCHAIN | grep -c ext4)
 if [ ${formatExt4OK} -eq 1 ]; then
-  echo "HDD was already inited or prepared"
+  echo "HDD was already initialized/prepared"
   echo "Now needs to be mounted"
   ./40addHDD.sh
   exit 1
diff --git a/home.admin/70initLND.sh b/home.admin/70initLND.sh
index bed44e8..d7547df 100755
--- a/home.admin/70initLND.sh
+++ b/home.admin/70initLND.sh
@@ -83,8 +83,8 @@ if [ ${lndRunning} -eq 0 ]; then
   sudo chmod +x /etc/systemd/system/lnd.service
   sudo systemctl enable lnd
   sudo systemctl start lnd
-  echo "Starting LND ... give 120 seconds to init."
-  sleep 120
+  echo ""
+  dialog --pause "  Starting LND - please wait .." 8 58 120
 fi
 
 ###### Check LND is running
@@ -157,8 +157,7 @@ Press OK and follow the 'Helping Instructions'.
   sudo sed -i "s/^setupStep=.*/setupStep=65/g" /home/admin/raspiblitz.info
 fi
 
-echo "--> lets wait 60 seconds for LND to get ready"
-sleep 60
+dialog --pause "  Waiting for LND - please wait .." 8 58 60
 
 ###### Copy LND macaroons to admin
 echo ""
@@ -206,40 +205,6 @@ else
   echo "OK - Wallet is already unlocked"
 fi
 
-#### Show Lighthning Sync
-#echo ""
-#echo "*** Check LND Sync ***"
-#item=0
-#lndSyncing=$(sudo -u bitcoin /usr/local/bin/lncli --chain=${network} 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 :
-#    do
-#      
-#      # show sync status
-#      ./80scanLND.sh
-#      sleep 15
-#      
-#      # break loop when synced
-#      lndSyncing=$(sudo -u bitcoin /usr/local/bin/lncli --chain=${network} getinfo 2>/dev/null | jq -r '.synced_to_chain' | grep -c true)
-#      if [ ${lndSyncing} -eq 1 ]; then
-#        break
-#      fi
-#
-#      # break loop when wallet is locked
-#      locked=$(sudo tail -n 1 /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log | grep -c unlock)
-#      if [ ${locked} -eq 1 ]; then
-#        break
-#      fi
-#
-#      sleep 15
-#
-#    done
-#  clear
-#else
-#  echo "OK - LND is in sync"
-#fi
-
 # set SetupState (scan is done - so its 80%)
 sudo sed -i "s/^setupStep=.*/setupStep=80/g" /home/admin/raspiblitz.info