fix TOR install #304

build_sdcard.sh

@@ -542,10 +542,12 @@ if [ "${baseImage}" = "raspbian" ]; then
   dialog --title "Display" --yesno "Are you using the default display available from Amazon?\nSelect 'No' if you are using the Swiss version from play-zone.ch!" 6 80
   defaultDisplay=$?
 
-  if [[ $defaultDisplay -eq 0 ]]
-  then
+  if [ "${defaultDisplay}" = "0" ]; then
+
     # *** RASPIBLITZ / LCD (at last - because makes a reboot) ***
     # based on https://www.elegoo.com/tutorial/Elegoo%203.5%20inch%20Touch%20Screen%20User%20Manual%20V1.00.2017.10.09.zip
+    
+    echo "--> LCD DEFAULT"
     cd /home/admin/
     sudo apt-mark hold raspberrypi-bootloader
     git clone https://github.com/goodtft/LCD-show.git
@@ -553,10 +555,13 @@ if [ "${baseImage}" = "raspbian" ]; then
     sudo chown -R admin:admin LCD-show
     cd LCD-show/
     sudo ./LCD35-show
+
   else
+
     # Download and install the driver
     # based on http://www.raspberrypiwiki.com/index.php/3.5_inch_TFT_800x480@60fps
 
+    echo "--> LCD ALTERNATIVE"
     cd /boot
     sudo wget http://www.raspberrypiwiki.com/download/RPI-HD-35-INCH-TFT/dt-blob-For-3B-plus.bin
     sudo mv dt-blob-For-3B-plus.bin dt-blob.bin
@@ -591,3 +596,4 @@ if [ "${baseImage}" = "raspbian" ]; then
 EOF
     init 6
   fi
+fi

home.admin/config.scripts/internet.tor.sh

@@ -18,6 +18,10 @@ prepareTorSources()
     # Prepare for TOR service
     echo "*** Install TOR repo keys ***"
 
+    echo "*** Installing dirmngr ***"
+    sudo apt install dirmngr -y
+    echo ""
+
     recvKeyResult=$(sudo gpg --keyserver keys.gnupg.net --recv 886DDD89 2>&1)
     echo "${recvKeyResult}"
     recvKeyFailed=$(echo "${recvKeyResult}" | grep -c 'Total number processed: 0')
@@ -108,10 +112,6 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     sudo apt-get update
     echo ""
 
-    echo "*** Installing dirmngr ***"
-    sudo apt install dirmngr -y
-    echo ""
-
     echo "*** Install Tor ***"
     sudo apt install tor tor-arm -y
 
@@ -219,7 +219,6 @@ EOF
 
   fi
 
-
   # ACTIVATE LND OVER TOR
   echo "*** Putting LND behind TOR ***"
   echo "Make sutre LND is disabled"