Merge branch 'master' of https://github.com/rootzoll/raspiblitz

home.admin/00infoLCD.sh

@@ -72,9 +72,15 @@ while :
 
     # before setup even started
     if [ ${setupStep} -eq 0 ]; then
-            
+
+      # check for internet connection
+      # https://en.wikipedia.org/wiki/1.1.1.1
+      online=$(ping 1.1.1.1 -c 1 -W 2 | grep -c '1 received')
+      if [ ${online} -eq 0 ]; then
+        message="no internet connection"
+
       # when in presync - get more info on progress
-      if [ "${state}" = "presync" ]; then
+      elif [ "${state}" = "presync" ]; then
         # get blockchain sync progress
         blockchaininfo="$(sudo -u root bitcoin-cli -conf=/home/admin/assets/bitcoin.conf getblockchaininfo 2>/dev/null)"
         message="starting"
@@ -83,15 +89,13 @@ while :
           message=$(echo "${message}*100" | bc)
           message="${message}%"
         fi
-      fi
 
       # when old data - improve message
-      if [ "${state}" = "olddata" ]; then
+      elif [ "${state}" = "olddata" ]; then
           message="login for manual migration"
-      fi
 
       # when no HDD - improve message
-      if [ "${state}" = "nohdd" ]; then
+      elif [ "${state}" = "nohdd" ]; then
           message="Connect HHD"
       fi
       

home.admin/80scanLND.sh

@@ -27,8 +27,13 @@ if [ ${#item} -eq 0 ]; then
 fi
 
 # if no progress info
+online=1
 if [ ${#item} -eq 0 ]; then
   item="?" 
+
+  # check if offline
+  # https://en.wikipedia.org/wiki/1.1.1.1
+  online=$(ping 1.1.1.1 -c 1 -W 2 | grep -c '1 received')
 fi
 
 # get total number of blocks
@@ -48,7 +53,11 @@ isWaitingBlockchain=$( sudo -u bitcoin tail -n 2 /mnt/hdd/lnd/logs/${network}/${
 if [ ${isWaitingBlockchain} -gt 0 ]; then
   isInitialChainSync=1
 fi
-if [ ${isInitialChainSync} -gt 0 ]; then
+if [ ${online} -eq 0 ]; then
+    heigh=7
+    width=44
+    infoStr=$(echo " Waiting INTERNET CONNECTION\n RaspiBlitz cannot ping 1.1.1.1\n Local IP is ${localip}\n Please check cables and router.")
+elif [ ${isInitialChainSync} -gt 0 ]; then
   heigh=7
   infoStr=" Waiting for final Blockchain Sync\n Progress: ${progress} %\n Please wait - this can take some time.\n ssh admin@${localip}\n Password A"
   if [ "$USER" = "admin" ]; then

home.admin/97addMobileWalletShango.sh

@@ -41,9 +41,10 @@ read key
 
 clear
 echo "*** STEP 2 : SCAN MACAROON (make whole QR code fill camera) ***"
-echo -e "${myip}:10009,\n$(xxd -p -c2000 ./.lnd/data/chain/bitcoin/mainnet/admin.macaroon)," > qr.txt && cat ./.lnd/tls.cert >>qr.txt && qrencode -t ANSIUTF8 < qr.txt
+echo -e "${myip}:10009,\n$(xxd -p -c2000 ./.lnd/data/chain/${network}/${chain}net/admin.macaroon)," > qr.txt && cat ./.lnd/tls.cert >>qr.txt && qrencode -t ANSI256 < qr.txt
 echo "(To shrink QR code: OSX->CMD- / LINUX-> CTRL-) Press ENTER when finished."
 read key
+shred qr.txt
 
 clear
 echo "Now press 'Connect' within the Shango Wallet."

home.admin/_background.sh

@@ -126,7 +126,7 @@ do
 
         # building REST command
         passwordC=$(cat /root/lnd.autounlock.pwd)
-        sudo python /home/admin/config.scripts/lnd.unlock.py $passwordC
+        sudo python /home/admin/config.scripts/lnd.unlock.py '$passwordC'
 
         #walletPasswordBase64=$(cat /root/lnd.autounlock.pwd | tr -d '\n' | base64 -w0)
         #MACAROON_HEADER="Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 /mnt/hdd/lnd/data/chain/${network}/${chain}net/admin.macaroon)"