From c0738d87bf5ba0f0a1432cbebf3160669de50b0b Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Tue, 21 Aug 2018 12:30:43 +0200
Subject: [PATCH] add TOR to menu

---
 build.sdcard/raspbianStretchDesktop.sh |  2 +-
 home.admin/00infoBlitz.sh              |  2 +-
 home.admin/00mainMenu.sh               | 18 +++++++++++++++++-
 home.admin/96addTorService.sh          |  8 ++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/build.sdcard/raspbianStretchDesktop.sh b/build.sdcard/raspbianStretchDesktop.sh
index 4b3c6ad0d..5b84e1163 100644
--- a/build.sdcard/raspbianStretchDesktop.sh
+++ b/build.sdcard/raspbianStretchDesktop.sh
@@ -10,7 +10,7 @@
 
 echo ""
 echo "***************************************"
-echo "* RASPIBLITZ SD CARD IMAGE SETUP v0.7 *"
+echo "* RASPIBLITZ SD CARD IMAGE SETUP v0.75*"
 echo "***************************************"
 echo ""
 
diff --git a/home.admin/00infoBlitz.sh b/home.admin/00infoBlitz.sh
index 3258cf758..81d7b5061 100755
--- a/home.admin/00infoBlitz.sh
+++ b/home.admin/00infoBlitz.sh
@@ -204,7 +204,7 @@ ${color_yellow}               ${color_gray}${ln_channels_online}/${ln_channels_t
 ${color_yellow}${ln_external}
 ${color_yellow}
 " \
-"RaspiBlitz v0.7" \
+"RaspiBlitz v0.75" \
 "-------------------------------------------" \
 "${load##up*,  }" "${temp}" \
 "${hdd}" "${sync_percentage}"
diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh
index b633c380a..32076c22d 100755
--- a/home.admin/00mainMenu.sh
+++ b/home.admin/00mainMenu.sh
@@ -84,6 +84,12 @@ else
       if [ "${network}" = "bitcoin" ]; then
         OPTIONS+=(SWITCH "Switch ${switchOption}")  
       fi
+      torInstalled=$(sudo ls /mnt/hdd/tor/lnd9735/hostname 2>/dev/null | grep 'hostname' -c)
+      if [ ${torInstalled} -eq 0 ]; then
+        OPTIONS+=(TOR "Make reachable thru TOR")  
+      else
+        OPTIONS+=(NYX "Monitor TOR")  
+      fi
 
       # final Options
       OPTIONS+=(X "Console / Terminal")   
@@ -131,6 +137,10 @@ case $CHOICE in
             read key
             ./00mainMenu.sh
             ;;
+        NYX)
+            sudo nyx
+            ./00mainMenu.sh
+            ;;
         lnchannels)
             lnchannels
             echo "Press ENTER to return to main menu."
@@ -179,6 +189,12 @@ case $CHOICE in
             read key
             ./00mainMenu.sh
             ;;   
+        TOR)
+            sudo ./96addTorService.sh
+            echo "Press ENTER to return to main menu."
+            read key
+            ./00mainMenu.sh
+            ;;   
         X)
             lncli -h
             echo "SUCH WOW come back with ./00mainMenu.sh"
@@ -187,4 +203,4 @@ case $CHOICE in
             ./AAunlockLND.sh
             ./00mainMenu.sh
             ;;
-esac
+esac
\ No newline at end of file
diff --git a/home.admin/96addTorService.sh b/home.admin/96addTorService.sh
index 23b0ba068..dc4c35376 100644
--- a/home.admin/96addTorService.sh
+++ b/home.admin/96addTorService.sh
@@ -11,6 +11,7 @@ network=`cat .network`
 # location of TOR config
 torrc="/etc/tor/torrc"
 
+# check if TOR was already installed and is funtional
 clear
 echo ""
 echo "*** Check if TOR service is functional ***"
@@ -25,6 +26,13 @@ else
   echo ""
 fi
 
+# ask user if to proceed
+dialog --title " WARNING " --yesno "At the moment you just can switch TOR on - YOU CANNOT SWITCH BACK. Do you want to proceed?" 8 57
+response=$?
+case $response in
+  1) exit 1;
+esac
+
 echo "*** Adding Tor Sources to sources.list ***"
 echo "deb http://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list
 echo "deb-src http://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list