From 94a8025744ba9eae80672964a35957ce8ab2045c Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Thu, 9 Aug 2018 13:04:23 +0200
Subject: [PATCH] little UI fixes

---
 home.admin/00mainMenu.sh    | 14 ++++++++++----
 home.admin/70initLND.sh     |  2 +-
 home.admin/BBconnectPeer.sh |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh
index fb3575b..21fca81 100755
--- a/home.admin/00mainMenu.sh
+++ b/home.admin/00mainMenu.sh
@@ -66,15 +66,21 @@ else
         switchOption="back to TESTNET"
       fi
 
-      # REGULAR MENU
+      # Basic Options
       OPTIONS+=(INFO "RaspiBlitz Status Screen" \
         FUNDING "Fund your Wallet" \
         CONNECT "Connect to a Peer" \
         CHANNEL "Open a Channel with Peer" \
         lnbalance "Detailed Wallet Balances" \
-        lnchannels "Lightning Channel List" \
-        SWITCH "Switch ${switchOption}"
-        X "Console / Terminal")
+        lnchannels "Lightning Channel List")
+
+      # Depending Options
+      if [ "${network}" = "bitcoin" ]; then
+        OPTIONS+=(SWITCH "Switch ${switchOption}")  
+      fi
+
+      # final Options
+      OPTIONS+=(X "Console / Terminal")   
 
     fi
 
diff --git a/home.admin/70initLND.sh b/home.admin/70initLND.sh
index 2e997c8..4d50641 100755
--- a/home.admin/70initLND.sh
+++ b/home.admin/70initLND.sh
@@ -172,7 +172,7 @@ if [ ${macaroonExists} -eq 0 ]; then
   echo "You may want try again with starting ./70initLND.sh"
   exit 1
 fi
-sudo mkdir /home/admin/.lnd
+sudo mkdir /home/admin/.lnd 2>/dev/null
 macaroonExists=$(sudo ls -la /home/admin/.lnd/ | grep -c admin.macaroon)
 if [ ${macaroonExists} -eq 0 ]; then
   sudo mkdir /home/admin/.lnd
diff --git a/home.admin/BBconnectPeer.sh b/home.admin/BBconnectPeer.sh
index 5449a42..8900335 100755
--- a/home.admin/BBconnectPeer.sh
+++ b/home.admin/BBconnectPeer.sh
@@ -40,7 +40,7 @@ echo ""
 echo "COMMAND LINE: "
 echo $command
 echo ""
-echo "RESULT:"
+echo "RESULT (might have to wait for timeout):"
 
 win=1
 info=""