mirrors/raspiblitz
1
0
Fork 0
mirror of https://github.com/rootzoll/raspiblitz.git synced 2025-02-25 07:07:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix TOR install #304

Browse source
This commit is contained in:
rootzoll 2019-02-09 16:41:48 +01:00
parent bf1de12a31
commit 2aa1c8471e
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build_sdcard.sh
View file

@ -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 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=$? defaultDisplay=$?
if [[ $defaultDisplay -eq 0 ]] if [ "${defaultDisplay}" = "0" ]; then
then
# *** RASPIBLITZ / LCD (at last - because makes a reboot) *** # *** 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 # 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/ cd /home/admin/
sudo apt-mark hold raspberrypi-bootloader sudo apt-mark hold raspberrypi-bootloader
git clone https://github.com/goodtft/LCD-show.git git clone https://github.com/goodtft/LCD-show.git
@ -553,10 +555,13 @@ if [ "${baseImage}" = "raspbian" ]; then
sudo chown -R admin:admin LCD-show sudo chown -R admin:admin LCD-show
cd LCD-show/ cd LCD-show/
sudo ./LCD35-show sudo ./LCD35-show
else else
# Download and install the driver # Download and install the driver
# based on http://www.raspberrypiwiki.com/index.php/3.5_inch_TFT_800x480@60fps # based on http://www.raspberrypiwiki.com/index.php/3.5_inch_TFT_800x480@60fps
echo "--> LCD ALTERNATIVE"
cd /boot cd /boot
sudo wget http://www.raspberrypiwiki.com/download/RPI-HD-35-INCH-TFT/dt-blob-For-3B-plus.bin 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 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 dtoverlay=i2c-gpio,i2c_gpio_scl=24,i2c_gpio_sda=23
fi fi
EOF EOF
init 6 init 6
fi
fi fi

11
home.admin/config.scripts/internet.tor.sh
View file

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