From 3517996fc1382048057de69fcee40d8e81d1feb5 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 16:11:28 +0100
Subject: [PATCH 01/18] #100 custom port in open testing and update

---
 home.admin/00infoBlitz.sh          |  6 +++++-
 home.admin/_bootstrap.provision.sh | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh
index 6073a20..f3e08f8 100755
--- a/home.admin/00infoBlitz.sh
+++ b/home.admin/00infoBlitz.sh
@@ -215,6 +215,10 @@ ln_channelInfo="\n"
 ln_external="\n"
 ln_alias="${hostname}"
 ln_publicColor=""
+ln_port=$(sudo cat /mnt/hdd/lnd/lnd.conf | grep "^listen=*" | cut -f2 -d':')
+if [ ${#ln_port} -eq 0 ]; then
+  ln_port="9735"
+fi
 
 wallet_unlocked=$(sudo tail -n 1 /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log 2> /dev/null | grep -c unlock)
 if [ "$wallet_unlocked" -gt 0 ] ; then
@@ -227,7 +231,7 @@ else
  if [ ${ln_tor} -eq 1 ]; then
    ln_publicColor="${color_green}"
  else
-   public_check=$(nc -z -w6 ${public_ip} 9735 2>/dev/null; echo $?)
+   public_check=$(nc -z -w6 ${public_ip} ${ln_port} 2>/dev/null; echo $?)
   if [ $public_check = "0" ]; then
     # only set yellow/normal because netcat can only say that the port is open - not that it points to this device for sure
     ln_publicColor="${color_yellow}"
diff --git a/home.admin/_bootstrap.provision.sh b/home.admin/_bootstrap.provision.sh
index 7eb2c1e..77a344e 100644
--- a/home.admin/_bootstrap.provision.sh
+++ b/home.admin/_bootstrap.provision.sh
@@ -156,6 +156,20 @@ else
     echo "Provisioning TOR - keep default" >> ${logFile}
 fi
 
+# CUSTOM PORT
+echo "Provisioning LND Port" >> ${logFile}
+lndPort=$(sudo cat /mnt/hdd/lnd/lnd.conf | grep "^listen=*" | cut -f2 -d':')
+if [ ${#lndPort} -gt 0 ]; then
+  if [ "${lndPort}" != "9735" ]; then
+    echo "User is running custom LND port: ${lndPort}" >> ${logFile}
+    sudo /home/admin/config.scripts/lnd.setport.sh ${lndPort} >> ${logFile} 2>&1
+  else
+    echo "User is running standard LND port: ${lndPort}" >> ${logFile}
+  fi
+else
+  echo "Was not able to get LND port from config." >> ${logFile}
+fi
+
 sudo sed -i "s/^message=.*/message='Setup Done'/g" ${infoFile}
 
 echo "DONE - Give raspi some cool off time after hard building .... 20 secs sleep" >> ${logFile}

From 4369c8ec01ef9809af24427131fa1b01da50a698 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 16:29:59 +0100
Subject: [PATCH 02/18] make sure bitcoin is stpooed

---
 home.admin/00mainMenu.sh   | 12 ++++++++++++
 home.admin/50torrentHDD.sh |  9 +++++++++
 2 files changed, 21 insertions(+)

diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh
index 59b79e2..0e02fde 100755
--- a/home.admin/00mainMenu.sh
+++ b/home.admin/00mainMenu.sh
@@ -65,6 +65,15 @@ if [ "${state}" = "reindex" ]; then
   exit 1
 fi 
 
+# singal that torrent is in re-download
+if [ "${state}" = "retorrent" ]; then
+  echo "Re-Index in progress ... start monitoring:"
+  /home/admin/50torrentHDD.sh
+  sudo sed -i "s/^state=.*/state=repair/g" /home/admin/raspiblitz.info
+  /home/admin/00mainMenu.sh
+  exit
+fi
+
 # if pre-sync is running - stop it - before continue
 if [ "${state}" = "presync" ]; then
   # stopping the pre-sync
@@ -157,6 +166,7 @@ waitUntilChainNetworkIsReady()
         reindex=$(sudo cat /mnt/hdd/${network}/debug.log | grep -c 'Please restart with -reindex or -reindex-chainstate to recover')
         if [ ${reindex} -gt 0 ] || [ "${clienterror}" = "missing blockchain" ]; then
           echo "!! DETECTED NEED FOR RE-INDEX in debug.log ... starting repair options."
+          sudo sed -i "s/^state=.*/state=repair/g" /home/admin/raspiblitz.info
           sleep 3
 
           dialog --backtitle "RaspiBlitz - Repair Script" --msgbox "Your blockchain data needs to be repaired.
@@ -184,6 +194,7 @@ To run a BACKUP of funds & channels first is recommended.
             echo "Starting TORRENT ..."
             sudo sed -i "s/^state=.*/state=retorrent/g" /home/admin/raspiblitz.info
             /home/admin/50torrentHDD.sh
+            sudo sed -i "s/^state=.*/state=repair/g" /home/admin/raspiblitz.info
             /home/admin/00mainMenu.sh
             exit
 
@@ -191,6 +202,7 @@ To run a BACKUP of funds & channels first is recommended.
             echo "Starting COPY ..."
             sudo sed -i "s/^state=.*/state=recopy/g" /home/admin/raspiblitz.info
             /home/admin/50copyHDD.sh
+            sudo sed -i "s/^state=.*/state=repair/g" /home/admin/raspiblitz.info
             /home/admin/00mainMenu.sh
             exit
 
diff --git a/home.admin/50torrentHDD.sh b/home.admin/50torrentHDD.sh
index c5631ba..63d7c1e 100755
--- a/home.admin/50torrentHDD.sh
+++ b/home.admin/50torrentHDD.sh
@@ -7,6 +7,15 @@ echo ""
 ## get basic info
 source /home/admin/raspiblitz.info
 
+
+# if setup was done - remove old data
+if [ "${setupStep}" = "100" ]; then
+  echo "stopping servcies ..."
+  sudo systemctl stop lnd 
+  sudo systemctl stop ${network}d
+  sudo systemctl disable ${network}d
+fi
+
 # make sure rtorrent is available
 sudo apt-get install rtorrent -y
 echo ""

From 0f0dd71c61483e836717428de875e859b1a04347 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 16:36:14 +0100
Subject: [PATCH 03/18] repair in LCD screen

---
 home.admin/00infoLCD.sh    | 11 +++++++++++
 home.admin/50copyHDD.sh    |  1 -
 home.admin/50torrentHDD.sh |  1 -
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh
index 9b3571d..e0b1d33 100755
--- a/home.admin/00infoLCD.sh
+++ b/home.admin/00infoLCD.sh
@@ -122,6 +122,17 @@ while :
       continue
     fi
     
+    # check if recovering/upgrade is running
+    if [ "${state}" = "repair" ] || [ "${state}" = "retorrent" ] || [ "${state}" = "recopy" ] ; then
+      l1="Repair Mode\n"
+      l2="ssh admin@${localip}\n"
+      l3="Use password: PasswordA\n"
+      boxwidth=$((${#localip} + 28))
+      dialog --backtitle "RaspiBlitz ${codeVersion} (${state}) ${setupStep} ${localip}" --infobox "$l1$l2$l3" 5 ${boxwidth}
+      sleep 3
+      continue
+    fi
+
     # if freshly recovered 
     if [ "${state}" = "recovered" ]; then
       l1="FINAL RECOVER LOGIN NEEDED:\n"
diff --git a/home.admin/50copyHDD.sh b/home.admin/50copyHDD.sh
index 03308c6..9c2150a 100755
--- a/home.admin/50copyHDD.sh
+++ b/home.admin/50copyHDD.sh
@@ -35,7 +35,6 @@ if [ "${setupStep}" = "100" ]; then
   echo "stopping servcies ..."
   sudo systemctl stop lnd 
   sudo systemctl stop bitcoind
-  sudo systemctl disable bitcoind
   sudo cp -f /mnt/hdd/bitcoin/bitcoin.conf /home/admin/assets/bitcoin.conf 
 fi
 
diff --git a/home.admin/50torrentHDD.sh b/home.admin/50torrentHDD.sh
index 63d7c1e..6702e39 100755
--- a/home.admin/50torrentHDD.sh
+++ b/home.admin/50torrentHDD.sh
@@ -13,7 +13,6 @@ if [ "${setupStep}" = "100" ]; then
   echo "stopping servcies ..."
   sudo systemctl stop lnd 
   sudo systemctl stop ${network}d
-  sudo systemctl disable ${network}d
 fi
 
 # make sure rtorrent is available

From 57839ea8fdcd8d96b99f8427532812438cd05e94 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 16:39:43 +0100
Subject: [PATCH 04/18] LCD info

---
 home.admin/00infoLCD.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh
index e0b1d33..c6e0570 100755
--- a/home.admin/00infoLCD.sh
+++ b/home.admin/00infoLCD.sh
@@ -123,7 +123,7 @@ while :
     fi
     
     # check if recovering/upgrade is running
-    if [ "${state}" = "repair" ] || [ "${state}" = "retorrent" ] || [ "${state}" = "recopy" ] ; then
+    if [ "${state}" = "repair" ] || [ "${state}" = "retorrent" ] || [ "${state}" = "recopy" ]; then
       l1="Repair Mode\n"
       l2="ssh admin@${localip}\n"
       l3="Use password: PasswordA\n"

From 43882a763b671215d0a7925467d2b4ba95d18388 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 17:05:10 +0100
Subject: [PATCH 05/18] fixed if

---
 home.admin/00infoLCD.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh
index c6e0570..aa6f2eb 100755
--- a/home.admin/00infoLCD.sh
+++ b/home.admin/00infoLCD.sh
@@ -123,7 +123,7 @@ while :
     fi
     
     # check if recovering/upgrade is running
-    if [ "${state}" = "repair" ] || [ "${state}" = "retorrent" ] || [ "${state}" = "recopy" ]; then
+    if [ $state == 'repair' ] || [ $state == 'retorrent' ] || [ $state == 'recopy' ] ; then
       l1="Repair Mode\n"
       l2="ssh admin@${localip}\n"
       l3="Use password: PasswordA\n"

From 8bf4c758f45a35d32654a96ebf1b48af33859cb5 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 17:10:20 +0100
Subject: [PATCH 06/18] fix info script

---
 home.admin/00infoLCD.sh | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh
index aa6f2eb..ade126a 100755
--- a/home.admin/00infoLCD.sh
+++ b/home.admin/00infoLCD.sh
@@ -122,8 +122,7 @@ while :
       continue
     fi
     
-    # check if recovering/upgrade is running
-    if [ $state == 'repair' ] || [ $state == 'retorrent' ] || [ $state == 'recopy' ] ; then
+    if [ $state == 'repair' ]; then
       l1="Repair Mode\n"
       l2="ssh admin@${localip}\n"
       l3="Use password: PasswordA\n"
@@ -133,6 +132,26 @@ while :
       continue
     fi
 
+    if [ $state == 'retorrent' ]; then
+      l1="Repair Mode- TORRENT\n"
+      l2="ssh admin@${localip}\n"
+      l3="Use password: PasswordA\n"
+      boxwidth=$((${#localip} + 28))
+      dialog --backtitle "RaspiBlitz ${codeVersion} (${state}) ${setupStep} ${localip}" --infobox "$l1$l2$l3" 5 ${boxwidth}
+      sleep 3
+      continue
+    fi
+
+    if [ $state == 'recopy' ]; then
+      l1="Repair Mode - COPY\n"
+      l2="ssh admin@${localip}\n"
+      l3="Use password: PasswordA\n"
+      boxwidth=$((${#localip} + 28))
+      dialog --backtitle "RaspiBlitz ${codeVersion} (${state}) ${setupStep} ${localip}" --infobox "$l1$l2$l3" 5 ${boxwidth}
+      sleep 3
+      continue
+    fi
+
     # if freshly recovered 
     if [ "${state}" = "recovered" ]; then
       l1="FINAL RECOVER LOGIN NEEDED:\n"

From 02587c519b4b43130be1f6d8a3326af610c58af1 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 17:18:51 +0100
Subject: [PATCH 07/18] fix infoscreen

---
 home.admin/00infoLCD.sh | 44 ++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh
index ade126a..a5ffd46 100755
--- a/home.admin/00infoLCD.sh
+++ b/home.admin/00infoLCD.sh
@@ -122,28 +122,30 @@ while :
       continue
     fi
     
-    if [ $state == 'repair' ]; then
-      l1="Repair Mode\n"
+    # if freshly recovered 
+    if [ "${state}" = "recovered" ]; then
+      l1="FINAL RECOVER LOGIN NEEDED:\n"
       l2="ssh admin@${localip}\n"
-      l3="Use password: PasswordA\n"
+      l3="Use password: raspiblitz\n"
       boxwidth=$((${#localip} + 28))
-      dialog --backtitle "RaspiBlitz ${codeVersion} (${state}) ${setupStep} ${localip}" --infobox "$l1$l2$l3" 5 ${boxwidth}
+      dialog --backtitle "RaspiBlitz ${codeVersion} (${state})" --infobox "$l1$l2$l3" 5 ${boxwidth}
       sleep 3
       continue
     fi
 
-    if [ $state == 'retorrent' ]; then
-      l1="Repair Mode- TORRENT\n"
-      l2="ssh admin@${localip}\n"
-      l3="Use password: PasswordA\n"
+    # if re-indexing 
+    if [ "${state}" = "reindex" ]; then
+      l1="REINDEXING BLOCKCHAIN\n"
+      l2="To monitor & detect finish:\n"
+      l3="ssh admin@${localip}\n"
       boxwidth=$((${#localip} + 28))
-      dialog --backtitle "RaspiBlitz ${codeVersion} (${state}) ${setupStep} ${localip}" --infobox "$l1$l2$l3" 5 ${boxwidth}
+      dialog --backtitle "RaspiBlitz ${codeVersion} (${state})" --infobox "$l1$l2$l3" 5 ${boxwidth}
       sleep 3
       continue
     fi
 
-    if [ $state == 'recopy' ]; then
-      l1="Repair Mode - COPY\n"
+    if [ "${state}" = "repair" ]; then
+      l1="Repair Mode\n"
       l2="ssh admin@${localip}\n"
       l3="Use password: PasswordA\n"
       boxwidth=$((${#localip} + 28))
@@ -152,24 +154,22 @@ while :
       continue
     fi
 
-    # if freshly recovered 
-    if [ "${state}" = "recovered" ]; then
-      l1="FINAL RECOVER LOGIN NEEDED:\n"
+    if [ "${state}" = "retorrent" ]; then
+      l1="Repair Mode- TORRENT\n"
       l2="ssh admin@${localip}\n"
-      l3="Use password: raspiblitz\n"
+      l3="Use password: PasswordA\n"
       boxwidth=$((${#localip} + 28))
-      dialog --backtitle "RaspiBlitz ${codeVersion} (${state})" --infobox "$l1$l2$l3" 5 ${boxwidth}
+      dialog --backtitle "RaspiBlitz ${codeVersion} (${state}) ${setupStep} ${localip}" --infobox "$l1$l2$l3" 5 ${boxwidth}
       sleep 3
       continue
     fi
 
-    # if re-indexing 
-    if [ "${state}" = "reindex" ]; then
-      l1="REINDEXING BLOCKCHAIN\n"
-      l2="To monitor & detect finish:\n"
-      l3="ssh admin@${localip}\n"
+    if [ "${state}" = "recopy" ]; then
+      l1="Repair Mode - COPY\n"
+      l2="ssh admin@${localip}\n"
+      l3="Use password: PasswordA\n"
       boxwidth=$((${#localip} + 28))
-      dialog --backtitle "RaspiBlitz ${codeVersion} (${state})" --infobox "$l1$l2$l3" 5 ${boxwidth}
+      dialog --backtitle "RaspiBlitz ${codeVersion} (${state}) ${setupStep} ${localip}" --infobox "$l1$l2$l3" 5 ${boxwidth}
       sleep 3
       continue
     fi

From b6048b59364c39a028cf17b578ffb6d623f77bd9 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 17:29:32 +0100
Subject: [PATCH 08/18] code move

---
 home.admin/00infoLCD.sh | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh
index a5ffd46..e3aaed1 100755
--- a/home.admin/00infoLCD.sh
+++ b/home.admin/00infoLCD.sh
@@ -144,6 +144,22 @@ while :
       continue
     fi
 
+    # when setup is in progress - password has been changed
+    if [ ${setupStep} -lt 100 ]; then
+      l1="Login to your RaspiBlitz with:\n"
+      l2="ssh admin@${localip}\n"
+      l3="Use your Password A\n"
+      boxwidth=$((${#localip} + 24))
+      sleep 3
+      dialog --backtitle "RaspiBlitz ${codeVersion} ${localip} - Welcome (${setupStep})" --infobox "$l1$l2$l3" 5 ${boxwidth}
+      sleep 7
+      continue
+    fi
+
+    ###########################
+    # DISPLAY AFTER SETUP
+    ###########################
+
     if [ "${state}" = "repair" ]; then
       l1="Repair Mode\n"
       l2="ssh admin@${localip}\n"
@@ -174,22 +190,6 @@ while :
       continue
     fi
 
-    # when setup is in progress - password has been changed
-    if [ ${setupStep} -lt 100 ]; then
-      l1="Login to your RaspiBlitz with:\n"
-      l2="ssh admin@${localip}\n"
-      l3="Use your Password A\n"
-      boxwidth=$((${#localip} + 24))
-      sleep 3
-      dialog --backtitle "RaspiBlitz ${codeVersion} ${localip} - Welcome (${setupStep})" --infobox "$l1$l2$l3" 5 ${boxwidth}
-      sleep 7
-      continue
-    fi
-
-    ###########################
-    # DISPLAY AFTER SETUP
-    ###########################
-
     # 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`

From 3213464efb6e9d03b768597da33c1ed329b18a37 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 17:59:08 +0100
Subject: [PATCH 09/18] correct size for checking blockchain

---
 home.admin/00mainMenu.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh
index 0e02fde..db41923 100755
--- a/home.admin/00mainMenu.sh
+++ b/home.admin/00mainMenu.sh
@@ -150,11 +150,15 @@ waitUntilChainNetworkIsReady()
       rm error.tmp
 
       # check for missing blockchain data
-      blockchainsize=$(sudo du /mnt/hdd/bitcoin | head -n1 | awk '{print $1;}')
+      minSize=250000000000
+      if [ "${network}" = "litecoin" ]; then
+        minSize=20000000000
+      fi
+      blockchainsize=$(sudo du -shbc /mnt/hdd/${network} | head -n1 | awk '{print $1;}')
       echo "blockchainsize(${blockchainsize})"
       if [ ${#blockchainsize} -gt 0 ]; then
-        if [ ${blockchainsize} -lt 1000000 ]; then
-          echo "Mission Blockchain Data ..."
+        if [ ${blockchainsize} -lt ${minsize} ]; then
+          echo "Mission Blockchain Data (<${minsize}) ..."
           clienterror="missing blockchain"
           sleep 3
         fi

From ca708c83cdf20632e3c98f761d35703206c10623 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 18:04:56 +0100
Subject: [PATCH 10/18] color undervoltage warning

---
 home.admin/00infoBlitz.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh
index f3e08f8..aba3c10 100755
--- a/home.admin/00infoBlitz.sh
+++ b/home.admin/00infoBlitz.sh
@@ -295,5 +295,5 @@ ${color_yellow}${ln_publicColor}${ln_external}
 "${hdd}" "${sync_percentage}"
 
 if [ ${#undervoltageReports} -gt 0 ] && [ "${undervoltageReports}" != "0" ]; then
-  echo "${undervoltageReports} undervoltage reports found in syslog"
+  echo "!! ${color_red}${undervoltageReports} undervoltage reports found in syslog !!"
 fi

From c9f7ce7ade997b747edc559819a0d9299430fec9 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 18:06:12 +0100
Subject: [PATCH 11/18] color on undervoltage warning

---
 home.admin/00infoBlitz.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh
index aba3c10..b71167d 100755
--- a/home.admin/00infoBlitz.sh
+++ b/home.admin/00infoBlitz.sh
@@ -295,5 +295,5 @@ ${color_yellow}${ln_publicColor}${ln_external}
 "${hdd}" "${sync_percentage}"
 
 if [ ${#undervoltageReports} -gt 0 ] && [ "${undervoltageReports}" != "0" ]; then
-  echo "!! ${color_red}${undervoltageReports} undervoltage reports found in syslog !!"
+  echo "!! ${color_red}${undervoltageReports} undervoltage reports found - maybe upgrade power supply !!"
 fi

From 5d0c39fa7e49fb7a43bf00cab585d09f3b395778 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 18:07:06 +0100
Subject: [PATCH 12/18] coloring undervoltage warning

---
 home.admin/00infoBlitz.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh
index b71167d..bc2cb36 100755
--- a/home.admin/00infoBlitz.sh
+++ b/home.admin/00infoBlitz.sh
@@ -286,7 +286,7 @@ ${color_yellow}    /,'        ${color_gray}
 ${color_yellow}   /'          ${color_gray}LND ${color_green}${ln_version} ${ln_baseInfo}
 ${color_yellow}               ${color_gray}${ln_channelInfo} ${ln_peersInfo}
 ${color_yellow}
-${color_yellow}${ln_publicColor}${ln_external}
+${color_yellow}${ln_publicColor}${ln_external}${color_red}
 
 " \
 "RaspiBlitz v${codeVersion}" \
@@ -295,5 +295,5 @@ ${color_yellow}${ln_publicColor}${ln_external}
 "${hdd}" "${sync_percentage}"
 
 if [ ${#undervoltageReports} -gt 0 ] && [ "${undervoltageReports}" != "0" ]; then
-  echo "!! ${color_red}${undervoltageReports} undervoltage reports found - maybe upgrade power supply !!"
+  echo "!! ${undervoltageReports} undervoltage reports found - maybe upgrade power supply !!"
 fi

From 85f083b93150a95ac2571b21ab552b8f4aa59246 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 18:07:26 +0100
Subject: [PATCH 13/18] text change

---
 home.admin/00infoBlitz.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh
index bc2cb36..75df46d 100755
--- a/home.admin/00infoBlitz.sh
+++ b/home.admin/00infoBlitz.sh
@@ -295,5 +295,5 @@ ${color_yellow}${ln_publicColor}${ln_external}${color_red}
 "${hdd}" "${sync_percentage}"
 
 if [ ${#undervoltageReports} -gt 0 ] && [ "${undervoltageReports}" != "0" ]; then
-  echo "!! ${undervoltageReports} undervoltage reports found - maybe upgrade power supply !!"
+  echo "${undervoltageReports} undervoltage reports found - maybe upgrade power supply"
 fi

From 6ae5184a68354f5d0d36f82c50fe75f3ef559f83 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 18:10:09 +0100
Subject: [PATCH 14/18] fix minSize blockchain check

---
 home.admin/00mainMenu.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh
index db41923..347e5d1 100755
--- a/home.admin/00mainMenu.sh
+++ b/home.admin/00mainMenu.sh
@@ -157,8 +157,8 @@ waitUntilChainNetworkIsReady()
       blockchainsize=$(sudo du -shbc /mnt/hdd/${network} | head -n1 | awk '{print $1;}')
       echo "blockchainsize(${blockchainsize})"
       if [ ${#blockchainsize} -gt 0 ]; then
-        if [ ${blockchainsize} -lt ${minsize} ]; then
-          echo "Mission Blockchain Data (<${minsize}) ..."
+        if [ ${blockchainsize} -lt ${minSize} ]; then
+          echo "Mission Blockchain Data (<${minSize}) ..."
           clienterror="missing blockchain"
           sleep 3
         fi

From 4e148092146560e2b1664bb1b17ba08349bef651 Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 18:59:57 +0100
Subject: [PATCH 15/18] added wait info

---
 home.admin/97addMobileWalletZap.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/home.admin/97addMobileWalletZap.sh b/home.admin/97addMobileWalletZap.sh
index 666cc14..5d2dd0a 100755
--- a/home.admin/97addMobileWalletZap.sh
+++ b/home.admin/97addMobileWalletZap.sh
@@ -44,9 +44,9 @@ fi
 # make sure qrcode-encoder in installed
 echo "*** Setup ***"
 echo ""
-echo "Installing zapconnect. Please wait..."
+echo "Installing zapconnect."
 echo ""
-echo "Getting github.com/LN-Zap/lndconnect (please wait) ..."
+echo "Getting github.com/LN-Zap/lndconnect (please wait - can take several minutes) ..."
 go get -d github.com/LN-Zap/lndconnect
 cd $GOPATH/src/github.com/LN-Zap/lndconnect
 echo ""

From 7628914295a32eb10de147b1e7d0eeb33f43f83f Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 19:12:34 +0100
Subject: [PATCH 16/18] #329 prepare v1.1 for BTRFS data drive

---
 build_sdcard.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build_sdcard.sh b/build_sdcard.sh
index 575694d..f1a00af 100644
--- a/build_sdcard.sh
+++ b/build_sdcard.sh
@@ -234,6 +234,9 @@ sudo apt-get install -y htop git curl bash-completion jq dphys-swapfile
 # installs bandwidth monitoring for future statistics
 sudo apt-get install -y vnstat
 
+# prepare for BTRFS data drive raid
+sudo apt-get install -y btrfs-tools
+
 # prepare for display graphics mode
 # see https://github.com/rootzoll/raspiblitz/pull/334
 sudo apt-get install -y fbi

From 6fb6b41f32aaeaa6b77f5934d98640f9577fedfa Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 19:30:42 +0100
Subject: [PATCH 17/18] #397 MacOS supports just basic progress

---
 home.admin/50copyHDD.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home.admin/50copyHDD.sh b/home.admin/50copyHDD.sh
index 9c2150a..1616238 100755
--- a/home.admin/50copyHDD.sh
+++ b/home.admin/50copyHDD.sh
@@ -71,7 +71,7 @@ echo "COPY, PASTE & EXECUTE the following command on the blockchain source compu
 if [ "${CHOICE}" = "WINDOWS" ]; then
   echo "sudo scp -r ./chainstate ./indexes ./blocks bitcoin@${localip}:/mnt/hdd/bitcoin"
 else
-  echo "sudo rsync -avhW --info=progress2 ./chainstate ./indexes ./blocks bitcoin@${localip}:/mnt/hdd/bitcoin"
+  echo "sudo rsync -avhW --progress ./chainstate ./indexes ./blocks bitcoin@${localip}:/mnt/hdd/bitcoin"
 fi
 echo "" 
 echo "This command may ask you first about the admin password of the other computer (because sudo)."

From 04d6fca2cb36f8788551a96d9662f3571183055b Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 17 Mar 2019 19:31:46 +0100
Subject: [PATCH 18/18] typo fix

---
 home.admin/00mainMenu.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh
index 347e5d1..a7e99da 100755
--- a/home.admin/00mainMenu.sh
+++ b/home.admin/00mainMenu.sh
@@ -158,7 +158,7 @@ waitUntilChainNetworkIsReady()
       echo "blockchainsize(${blockchainsize})"
       if [ ${#blockchainsize} -gt 0 ]; then
         if [ ${blockchainsize} -lt ${minSize} ]; then
-          echo "Mission Blockchain Data (<${minSize}) ..."
+          echo "Missing Blockchain Data (<${minSize}) ..."
           clienterror="missing blockchain"
           sleep 3
         fi