From bd90575b0c0a44b25a4b0174c9f8c9dc520e0a5b Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Mon, 11 Feb 2019 19:59:09 +0100
Subject: [PATCH] services update

---
 README.md                            |  2 +-
 home.admin/00infoLCD.sh              | 14 +++++++++-----
 home.admin/00settingsMenuServices.sh | 12 +++++++++++-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index ad1122f..4984332 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ This is a quick look at the SSH main menu and services (once RaspiBlitz is SetUp
 
 ![MainMenu-Services](pictures/mainmenu-services.png)
 
-As an alternative to the SSH menu there is also the RTL WebUI available: 
+As an parallel alternative to the SSH menu there is also the RTL WebUI available: 
 
 ![RTL-preview](pictures/RTL-dashboard.png)
 
diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh
index 6949014..fe36ef4 100755
--- a/home.admin/00infoLCD.sh
+++ b/home.admin/00infoLCD.sh
@@ -183,19 +183,23 @@ while :
     if [ "${locked}" -gt 0 ]; then
 
       # special case: LND wallet is locked ---> show unlock info
+      h=5
       l1="!!! LND WALLET IS LOCKED !!!\n"
       l2="Login: ssh admin@${localip}\n"
       l3="Use your Password A\n"
-      #if [ "${rtlWebinterface}" = "on" ]; then
-      #  l2="Open: http://${localip}:3000\n"
-      #  l3="Use Password C to unlock\n"
-      #fi
+      l4=""
+      if [ "${rtlWebinterface}" = "on" ]; then
+        l2="Browser: http://${localip}:3000\n"
+        l3="PasswordB=login / PasswordC=unlock\n"
+        l4="PasswordA: ssh admin@${localip}"
+        h=6
+      fi
       if [ "${autoUnlock}" = "on" ]; then
         l2="ssh admin@${localip}\n"
         l3="Waiting for AUTO-UNLOCK"
       fi
       boxwidth=$((${#localip} + 24))
-      dialog --backtitle "RaspiBlitz ${codeVersion} (${localip}) - ${hostname}" --infobox "$l1$l2$l3" 5 ${boxwidth}
+      dialog --backtitle "RaspiBlitz ${codeVersion} (${localip}) - ${hostname}" --infobox "$l1$l2$l3$l4" ${h} ${boxwidth}
       sleep 5
       continue
     fi
diff --git a/home.admin/00settingsMenuServices.sh b/home.admin/00settingsMenuServices.sh
index d4dd816..6f72895 100644
--- a/home.admin/00settingsMenuServices.sh
+++ b/home.admin/00settingsMenuServices.sh
@@ -34,7 +34,7 @@ fi
 
 # show select dialog
 echo "run dialog ..."
-CHOICES=$(dialog --checklist 'Activate/Deactivate Services:' 15 45 7 \
+CHOICES=$(dialog --title "spacebar => check/uncheck" --checklist 'Activate/Deactivate Services:' 15 45 7 \
 1 'Channel Autopilot' ${autoPilot} \
 2 'Testnet' ${chainValue} \
 3 ${dynDomainMenu} ${domainValue} \
@@ -54,12 +54,14 @@ if [ ${dialogcancel} -eq 1 ]; then
 fi
 
 needsReboot=0
+anychange=0
 
 # AUTOPILOT process choice
 choice="off"; check=$(echo "${CHOICES}" | grep -c "1")
 if [ ${check} -eq 1 ]; then choice="on"; fi
 if [ "${autoPilot}" != "${choice}" ]; then
   echo "Autopilot Setting changed .."
+  anychange=1
   sudo /home/admin/config.scripts/lnd.autopilot.sh ${choice}
   needsReboot=1
 else 
@@ -74,6 +76,7 @@ if [ "${chain}" != "${choice}" ]; then
      dialog --title 'FAIL' --msgbox 'Litecoin-Testnet not available.' 5 25
   else
     echo "Testnet Setting changed .."
+    anychange=1
     sudo /home/admin/config.scripts/network.chain.sh ${choice}net
     walletExists=$(sudo ls /mnt/hdd/lnd/data/chain/${network}/${choice}net/wallet.db 2>/dev/null | grep -c 'wallet.db')
     if [ ${walletExists} -eq 0 ]; then
@@ -143,6 +146,7 @@ choice="off"; check=$(echo "${CHOICES}" | grep -c "3")
 if [ ${check} -eq 1 ]; then choice="on"; fi
 if [ "${domainValue}" != "${choice}" ]; then
   echo "Dynamic Domain changed .."
+  anychange=1
   sudo /home/admin/config.scripts/internet.dyndomain.sh ${choice}
   needsReboot=1
 else
@@ -154,6 +158,7 @@ choice="off"; check=$(echo "${CHOICES}" | grep -c "4")
 if [ ${check} -eq 1 ]; then choice="on"; fi
 if [ "${runBehindTor}" != "${choice}" ]; then
   echo "TOR Setting changed .."
+  anychange=1
   sudo /home/admin/config.scripts/internet.tor.sh ${choice}
   needsReboot=1
 else 
@@ -184,6 +189,7 @@ choice="off"; check=$(echo "${CHOICES}" | grep -c "6")
 if [ ${check} -eq 1 ]; then choice="on"; fi
 if [ "${autoUnlock}" != "${choice}" ]; then
   echo "LND Autounlock Setting changed .."
+  anychange=1
   sudo /home/admin/config.scripts/lnd.autounlock.sh ${choice}
   l1="AUTO-UNLOCK IS NOW OFF"
   if [ "${choice}" = "on" ]; then
@@ -198,6 +204,10 @@ else
   echo "LND Autounlock Setting unchanged."
 fi
 
+if [ ${anychange} -eq 1 ]; then
+     dialog --pause "Use Spacebar to check/uncheck services." 8 58 5
+fi
+
 if [ ${needsReboot} -eq 1 ]; then
    sleep 2
    dialog --pause "OK. System will reboot to activate changes." 8 58 8