From f12410227b6cf33a5850c681ec346b899f3feff9 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Sat, 9 Feb 2019 15:12:37 +0100
Subject: [PATCH] adding TOR keys

---
 home.admin/config.scripts/internet.tor.sh | 71 ++++++++++++++---------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/home.admin/config.scripts/internet.tor.sh b/home.admin/config.scripts/internet.tor.sh
index a2b3a5c..b0c090d 100755
--- a/home.admin/config.scripts/internet.tor.sh
+++ b/home.admin/config.scripts/internet.tor.sh
@@ -8,10 +8,49 @@
 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
  echo "small config script to switch TOR on or off"
- echo "internet.tor.sh [on|off]"
+ echo "internet.tor.sh [on|off|prepare]"
  exit 1
 fi
 
+# function: install keys & sources
+prepareTorSources()
+{
+    # Prepare for TOR service
+    echo "*** Install TOR repo keys ***"
+
+    recvKeyResult=$(sudo gpg --keyserver keys.gnupg.net --recv 886DDD89 2>&1)
+    echo "${recvKeyResult}"
+    recvKeyFailed=$(echo "${recvKeyResult}" | grep -c 'Total number processed: 0')
+    if [ ${recvKeyFailed} -eq 1 ]; then
+        echo "FAILED: sudo gpg --keyserver keys.gnupg.net --recv 886DDD89"
+        exit 1
+    fi
+    sudo gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
+    echo ""
+ 
+    recvKeyResult=$(sudo gpg --keyserver pgpkeys.mit.edu --recv-key  74A941BA219EC810 2>&1)
+    echo "${recvKeyResult}"
+    recvKeyFailed=$(echo "${recvKeyResult}" | grep -c 'Total number processed: 0')
+    if [ ${recvKeyFailed} -eq 1 ]; then
+        echo "FAILED: sudo gpg --keyserver pgpkeys.mit.edu --recv-key  74A941BA219EC810"
+        exit 1
+    fi
+    sudo gpg -a --export 74A941BA219EC810 | sudo apt-key add -
+    echo ""
+
+    echo "*** Adding Tor Sources to sources.list ***"
+    echo "deb https://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list
+    echo "deb-src https://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list
+    echo "OK"
+    echo ""
+}
+
+# if started with prepare 
+if [ "$1" = "prepare" ] || [ "$1" = "-prepare" ]; then
+  prepareTorSources
+  exit 0
+fi
+
 # check and load raspiblitz config
 # to know which network is running
 source /home/admin/raspiblitz.info
@@ -62,35 +101,9 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   packageInstalled=$(dpkg -s tor-arm | grep -c 'Status: install ok')
   if [ ${packageInstalled} -eq 0 ]; then
 
-    # Prepare for TOR service
-    echo "*** Install TOR repo keys ***"
-
-    recvKeyResult=$(sudo gpg --keyserver keys.gnupg.net --recv 886DDD89 2>&1)
-    echo "${recvKeyResult}"
-    recvKeyFailed=$(echo "${recvKeyResult}" | grep -c 'Total number processed: 0')
-    if [ ${recvKeyFailed} -eq 1 ]; then
-        echo "FAILED: sudo gpg --keyserver keys.gnupg.net --recv 886DDD89"
-        exit 1
-    fi
-    sudo gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
-    echo ""
- 
-    recvKeyResult=$(sudo gpg --keyserver pgpkeys.mit.edu --recv-key  74A941BA219EC810 2>&1)
-    echo "${recvKeyResult}"
-    recvKeyFailed=$(echo "${recvKeyResult}" | grep -c 'Total number processed: 0')
-    if [ ${recvKeyFailed} -eq 1 ]; then
-        echo "FAILED: sudo gpg --keyserver pgpkeys.mit.edu --recv-key  74A941BA219EC810"
-        exit 1
-    fi
-    sudo gpg -a --export 74A941BA219EC810 | sudo apt-key add -
-    echo ""
+    # calling function from above
+    prepareTorSources
 
-    echo "*** Adding Tor Sources to sources.list ***"
-    echo "deb https://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list
-    echo "deb-src https://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list
-    echo "OK"
-    echo ""
-    
     echo "*** Updating System ***"
     sudo apt-get update
     echo ""