From 9ecbcd0d0c719c77afd3f27d1cfc044928280b2d Mon Sep 17 00:00:00 2001
From: Christian Rotzoll <christian@geektank.de>
Date: Sun, 28 Jul 2019 17:32:59 +0200
Subject: [PATCH]  #592 prevent TOR sources multiple times & buster

---
 home.admin/config.scripts/internet.tor.sh | 32 ++++++++++++++++-------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/home.admin/config.scripts/internet.tor.sh b/home.admin/config.scripts/internet.tor.sh
index be4ee70..af9d7ac 100755
--- a/home.admin/config.scripts/internet.tor.sh
+++ b/home.admin/config.scripts/internet.tor.sh
@@ -51,19 +51,33 @@ prepareTorSources()
     echo ""
 
     echo "*** Adding KEYS deb.torproject.org ***"
-    curl https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | sudo gpg --import
-    sudo gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
+    torKeyAvailable=$(sudo gpg --list-keys | grep -c "A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89")
+    echo "torKeyAvailable=${torKeyAvailable}"
+    if [ ${torKeyAvailable} -eq 0 ]; then
+      curl https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | sudo gpg --import
+      sudo gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
+      echo "OK"
+    else
+      echo "TOR key is available"
+    fi
     echo ""
  
     echo "*** Adding Tor Sources to sources.list ***"
-    if [ "${baseImage}" = "raspbian" ] || [ "${baseImage}" = "armbian" ] || [ "${baseImage}" = "dietpi" ]; then
-      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
-    elif [ "${baseImage}" = "ubuntu" ]; then
-      echo "deb https://deb.torproject.org/torproject.org bionic main" | sudo tee -a /etc/apt/sources.list
-      echo "deb-src https://deb.torproject.org/torproject.org bionic main" | sudo tee -a /etc/apt/sources.list    
+    torSourceListAvailable=$(sudo cat /etc/apt/sources.list | grep -c 'https://deb.torproject.org/torproject.org')
+    echo "torSourceListAvailable=${torSourceListAvailable}"  
+    if [ ${torSourceListAvailable} -eq 0 ]; then
+      echo "Adding TOR sources ..."
+      if [ "${baseImage}" = "raspbian" ] || [ "${baseImage}" = "armbian" ] || [ "${baseImage}" = "dietpi" ]; then
+        echo "deb https://deb.torproject.org/torproject.org buster main" | sudo tee -a /etc/apt/sources.list
+        echo "deb-src https://deb.torproject.org/torproject.org buster main" | sudo tee -a /etc/apt/sources.list
+      elif [ "${baseImage}" = "ubuntu" ]; then
+        echo "deb https://deb.torproject.org/torproject.org bionic main" | sudo tee -a /etc/apt/sources.list
+        echo "deb-src https://deb.torproject.org/torproject.org bionic main" | sudo tee -a /etc/apt/sources.list    
+      fi
+      echo "OK"
+    else
+      echo "TOR sources are available"
     fi
-    echo "OK"
     echo ""
 }