From f6d3bfb6fd41b4446304acb79e6a4a64aafce0b5 Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 12:21:55 -0400
Subject: [PATCH] wireguard without PPAs

---
 scripts/subinstallers/wireguard.sh | 38 ++++++++++++++++++------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/scripts/subinstallers/wireguard.sh b/scripts/subinstallers/wireguard.sh
index d027f79..82ffea5 100755
--- a/scripts/subinstallers/wireguard.sh
+++ b/scripts/subinstallers/wireguard.sh
@@ -2,23 +2,31 @@
 
 figlet "Mistborn: Installing Wireguard"
 
-# Wireguard
-if [ "$DISTRO" == "raspbian" ]; then
-    echo "Adding Wireguard repo keys"
-    sudo apt-get install -y dirmngr
-    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8B48AD6246925553
-    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7638D0442B90D010
-    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC
+# if wireguard not in current repositories
+if [ ! $(sudo apt-cache show wireguard > /dev/null 2>&1) ]; then
+    # install PPAs
+
+    echo "Adding Wireguard PPAs"
+
+    # Wireguard
+    if [ "$DISTRO" == "raspbian" ]; then
+        echo "Adding Wireguard repo keys"
+        sudo apt-get install -y dirmngr
+        sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8B48AD6246925553
+        sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7638D0442B90D010
+        sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC
+    fi
+
+    if [ "$DISTRO" == "ubuntu" ]; then
+        # Ubuntu	
+        sudo add-apt-repository -y ppa:wireguard/wireguard
+    elif [ "$DISTRO" == "debian" ] || [ "$DISTRO" == "raspbian" ]; then
+        # Debian
+        sudo bash -c 'echo "deb http://deb.debian.org/debian/ unstable main" > /etc/apt/sources.list.d/unstable.list'
+        sudo bash -c "printf 'Package: *\nPin: release a=unstable\nPin-Priority: 90\n' > /etc/apt/preferences.d/limit-unstable"
+    fi
 fi
 
 echo "Installing Wireguard"
-if [ "$DISTRO" == "ubuntu" ]; then
-    # Ubuntu	
-    sudo add-apt-repository -y ppa:wireguard/wireguard
-elif [ "$DISTRO" == "debian" ] || [ "$DISTRO" == "raspbian" ]; then
-    # Debian
-    sudo bash -c 'echo "deb http://deb.debian.org/debian/ unstable main" > /etc/apt/sources.list.d/unstable.list'
-    sudo bash -c "printf 'Package: *\nPin: release a=unstable\nPin-Priority: 90\n' > /etc/apt/preferences.d/limit-unstable"
-fi
 sudo apt-get update
 sudo apt-get install -y openresolv wireguard