From 7d2351032081187d7221e71430130aca798631b5 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Fri, 27 Jul 2018 11:17:59 +0200
Subject: [PATCH] additional script refactor

---
 home.admin/00mainMenu.sh                      | 29 ++++++++++++-------
 home.admin/90finishSetup.sh                   |  3 ++
 ...7addAdditionalScripts.sh => 91addBonus.sh} |  3 ++
 3 files changed, 25 insertions(+), 10 deletions(-)
 rename home.admin/{67addAdditionalScripts.sh => 91addBonus.sh} (79%)

diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh
index 2aa6f711c..bb873dad0 100755
--- a/home.admin/00mainMenu.sh
+++ b/home.admin/00mainMenu.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ## default menu settings
-HEIGHT=9
+HEIGHT=11
 WIDTH=64
 CHOICE_HEIGHT=4
 BACKTITLE="RaspiBlitz"
@@ -14,7 +14,6 @@ setupState=0;
 if [ -f "/home/admin/.setup" ]; then
   setupState=$( cat /home/admin/.setup )
 fi
-
 if [ ${setupState} -eq 0 ]; then
 
     # start setup
@@ -55,8 +54,9 @@ else
     else
 
      # REGULAR MENU
-      OPTIONS+=(INFO "Show RaspiBlitz Status Screen" \
-		ADD "Add lnbalance and lnchannels command")
+      OPTIONS+=(INFO "RaspiBlitz Status Screen" \
+		lnbalance "Detailed Wallet Balances" \
+        lnchannels "Lightning Channel List")
 
     fi
 
@@ -82,14 +82,23 @@ case $CHOICE in
         INFO)
             ./00infoBlitz.sh
             echo "Screen is not updating ... press ENTER to continue."
-	    read key
-            ./00mainMenu.sh;
+            read key
+            ./00mainMenu.sh
+            ;;
+        lnbalance)
+            lnbalance
+            echo "Press ENTER to return to main menu."
+            read key
+            ./00mainMenu.sh
+            ;;
+        lnchannels)
+            lnchannels
+            echo "Press ENTER to return to main menu."
+            read key
+            ./00mainMenu.sh
             ;;
-	ADD) # add scripts
-	    ./67addAdditionalScripts.sh	
-	    ;;
         X) # unlock
             ./AAunlockLND.sh
-	    ./00mainMenu.sh
+            ./00mainMenu.sh
             ;;
 esac
diff --git a/home.admin/90finishSetup.sh b/home.admin/90finishSetup.sh
index 2b73aa76d..07c648860 100755
--- a/home.admin/90finishSetup.sh
+++ b/home.admin/90finishSetup.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 echo ""
 
+# add bonus scripts
+./91addBonus.sh
+
 ###### SWAP
 echo "*** SWAP file ***"
 swapExists=$(swapon -s | grep -c /mnt/hdd/swapfile)
diff --git a/home.admin/67addAdditionalScripts.sh b/home.admin/91addBonus.sh
similarity index 79%
rename from home.admin/67addAdditionalScripts.sh
rename to home.admin/91addBonus.sh
index 9a56dc6e6..0b15e618b 100755
--- a/home.admin/67addAdditionalScripts.sh
+++ b/home.admin/91addBonus.sh
@@ -1,3 +1,6 @@
+# https://github.com/Stadicus/guides/blob/master/raspibolt/raspibolt_67_additional-scripts.md
+
+echo "*** Adding: raspibolt_67_additional-scripts.md"
 echo "Creating the command lnbalance as well as lnchannels which will give you a nicer output"
 cd
 mkdir /home/admin/tmpScriptDL