diff --git a/build_sdcard.sh b/build_sdcard.sh index 1666086b6..77fd283b5 100644 --- a/build_sdcard.sh +++ b/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 @@ -589,5 +594,6 @@ if [ "${baseImage}" = "raspbian" ]; then dtoverlay=i2c-gpio,i2c_gpio_scl=24,i2c_gpio_sda=23 fi EOF - init 6 + init 6 + fi fi diff --git a/home.admin/config.scripts/internet.tor.sh b/home.admin/config.scripts/internet.tor.sh index b0c090d8f..33923f530 100755 --- a/home.admin/config.scripts/internet.tor.sh +++ b/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" @@ -284,4 +283,4 @@ fi echo "FAIL - Unknown Paramter $1" echo "may needs reboot to run normal again" -exit 1 +exit 1 \ No newline at end of file