From b2134b8fde561efc7d274f9fcaab2785821ea062 Mon Sep 17 00:00:00 2001
From: Tommy Huff <tuplink@gmail.com>
Date: Wed, 19 Oct 2016 14:49:03 -0400
Subject: [PATCH] remove CIDR from IPs

---
 advanced/Scripts/blacklist.sh | 13 ++++++-------
 advanced/Scripts/whitelist.sh | 10 +++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/advanced/Scripts/blacklist.sh b/advanced/Scripts/blacklist.sh
index 3a3d775b..60afe740 100755
--- a/advanced/Scripts/blacklist.sh
+++ b/advanced/Scripts/blacklist.sh
@@ -97,10 +97,10 @@ ModifyHostFile(){
               echo ":::"
               echo -n "::: Modifying HOSTS file to blacklist $numberOf domain${plural}..."
               if [[ -n "${IPv6_address}" ]] ; then
-                sed "s/^/${IPv6_address} /g" ${blacklist} >> ${adList}
+                sed "s/^/$IPv6_address /g" ${blacklist} >> ${adList}
               fi
               if [[ -n "${IPv4_address}" ]] ; then
-                sed "s/^/${IPv4_address} /g" ${blacklist} >> ${adList}
+                sed "s/^/$IPv4_address /g" ${blacklist} >> ${adList}
               fi
             fi
 	  else
@@ -198,11 +198,10 @@ else
 fi
 
 if [[ -n "${IPv6_address}" ]] ; then
-  piholeIP=${IPv6_address}
-  piholeIP=$(echo "${piholeIP}" | cut -f1 -d"/")
-else
-  piholeIP=${IPv4_address}
-  piholeIP=$(echo "${piholeIP}" | cut -f1 -d"/")
+  IPv6_address=$(echo "${IPv6_address}" | cut -f1 -d"/")
+fi
+if [[ -n "${IPv6_address}" ]] ; then
+  IPv4_address=$(echo "${IPv4_address}" | cut -f1 -d"/")
 fi
 
 
diff --git a/advanced/Scripts/whitelist.sh b/advanced/Scripts/whitelist.sh
index 6da5963f..ab20fda0 100755
--- a/advanced/Scripts/whitelist.sh
+++ b/advanced/Scripts/whitelist.sh
@@ -209,12 +209,12 @@ else
     exit 1
 fi
 
+#remove CIDR from IPs
 if [[ -n "${IPv6_address}" ]] ; then
-  piholeIP=${IPv6_address}
-  piholeIP=$(echo "${piholeIP}" | cut -f1 -d"/")
-else
-  piholeIP=${IPv4_address}
-  piholeIP=$(echo "${piholeIP}" | cut -f1 -d"/")
+  IPv6_address=$(echo "${IPv6_address}" | cut -f1 -d"/")
+fi
+if [[ -n "${IPv6_address}" ]] ; then
+  IPv4_address=$(echo "${IPv4_address}" | cut -f1 -d"/")
 fi
 
 PopWhitelistFile