From acfd56a7b9ea54b3b63126c61a93271f2e33d19d Mon Sep 17 00:00:00 2001
From: Tommy Huff <tuplink@gmail.com>
Date: Wed, 19 Oct 2016 15:10:33 -0400
Subject: [PATCH] Working on ipv6 + ipv4

---
 advanced/Scripts/blacklist.sh |  2 +-
 advanced/Scripts/whitelist.sh |  2 +-
 gravity.sh                    | 13 +++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/advanced/Scripts/blacklist.sh b/advanced/Scripts/blacklist.sh
index b09eb1e4..b4aea27f 100755
--- a/advanced/Scripts/blacklist.sh
+++ b/advanced/Scripts/blacklist.sh
@@ -201,7 +201,7 @@ fi
 if [[ -n "${IPv6_address}" ]] ; then
   IPv6_address=$(echo "${IPv6_address}" | cut -f1 -d"/")
 fi
-if [[ -n "${IPv6_address}" ]] ; then
+if [[ -n "${IPv4_address}" ]] ; then
   IPv4_address=$(echo "${IPv4_address}" | cut -f1 -d"/")
 fi
 
diff --git a/advanced/Scripts/whitelist.sh b/advanced/Scripts/whitelist.sh
index ab20fda0..8582e1ef 100755
--- a/advanced/Scripts/whitelist.sh
+++ b/advanced/Scripts/whitelist.sh
@@ -213,7 +213,7 @@ fi
 if [[ -n "${IPv6_address}" ]] ; then
   IPv6_address=$(echo "${IPv6_address}" | cut -f1 -d"/")
 fi
-if [[ -n "${IPv6_address}" ]] ; then
+if [[ -n "${IPv4_address}" ]] ; then
   IPv4_address=$(echo "${IPv4_address}" | cut -f1 -d"/")
 fi
 
diff --git a/gravity.sh b/gravity.sh
index 14344c7b..fc0e6d9e 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -215,11 +215,11 @@ gravity_hostFormat() {
         fi
         # Add hostname and dummy domain to the top of gravity.list to make ping result return a friendlier looking domain! Also allows for an easy way to access the Pi-hole admin console (pi.hole/admin)
         if [[ -n "${IPv6_address}" ]] ; then
-          echo -e "${IPv6_address} $hostname\n${IPv6_address} pi.hole" > ${piholeDir}/${accretionDisc}
+          echo -e "${IPv6_address} $hostname\n${IPv6_address} pi.hole" >> ${piholeDir}/${accretionDisc}
           cat ${piholeDir}/${eventHorizon} | awk -v ipv6addr="${IPv6_address}" '{sub(/\r$/,""); print ipv6addr" "$0}' >> ${piholeDir}/${accretionDisc}
         fi
         if [[ -n "${IPv4_address}" ]] ; then
-          echo -e "${IPv4_address} $hostname\n${IPv4_address} pi.hole" > ${piholeDir}/${accretionDisc}
+          echo -e "${IPv4_address} $hostname\n${IPv4_address} pi.hole" >> ${piholeDir}/${accretionDisc}
           cat ${piholeDir}/${eventHorizon} | awk -v ipv4addr="${IPv4_address}" '{sub(/\r$/,""); print ipv4addr" "$0}' >> ${piholeDir}/${accretionDisc}
         fi
         # Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
@@ -323,6 +323,15 @@ if [[ -r ${piholeDir}/pihole.conf ]];then
     echo "::: pihole.conf file no longer supported. Over-rides in this file are ignored."
 fi
 
+#remove CIDR from IPs
+if [[ -n "${IPv6_address}" ]] ; then
+  IPv6_address=$(echo "${IPv6_address}" | cut -f1 -d"/")
+fi
+if [[ -n "${IPv4_address}" ]] ; then
+  IPv4_address=$(echo "${IPv4_address}" | cut -f1 -d"/")
+fi
+
+
 if [[ ${forceGrav} == true ]]; then
         echo -n "::: Deleting exising list cache..."
         for f in ${piholeDir}/list.* ; do