From 7ae2fc37c05c41f946ee24f30ebfddbfcca0c8fa Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@ganymeade.com>
Date: Mon, 10 Oct 2016 06:23:17 -0700
Subject: [PATCH] Match up descriptive variable names with `setupVars.conf`.
 Rectifies Ubuntu 16.04 `gravity.list` bug.

---
 gravity.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index 05354c43..33ad92b4 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -48,7 +48,7 @@ blacklistScript=/opt/pihole/blacklist.sh
 #Source the setupVars from install script for the IP
 . /etc/pihole/setupVars.conf
 #Remove the /* from the end of the IPv4addr.
-IPv4addr=${IPv4addr%/*}
+IPv4_address=${IPv4addr%/*}
 
 # Variables for various stages of downloading and formatting the list
 basename=pihole
@@ -254,7 +254,7 @@ function gravity_hostFormat() {
 		echo "::: Error: Unable to determine fully qualified domain name of host"
 	fi
 	# If there is a value in the $piholeIPv6, then IPv6 will be used, so the awk command modified to create a line for both protocols
-	if [[ -n ${piholeIPv6} ]];then
+	if [[ -n ${IPV6_address} ]];then
 		# 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)
 		echo -e "$IPv4addr $hostname\n$piholeIPv6 $hostname\n$IPv4addr pi.hole\n$piholeIPv6 pi.hole" > ${piholeDir}/${accretionDisc}
 		cat ${piholeDir}/${eventHorizon} | awk -v ipv4addr="$IPv4addr" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> ${piholeDir}/${accretionDisc}