From af982a02af54c7b39db81648ec653feebb5f6930 Mon Sep 17 00:00:00 2001
From: Promofaux <adzjwarner@gmail.com>
Date: Tue, 19 Jan 2016 21:14:01 +0000
Subject: [PATCH 1/2] Move call to CheckIPv6 function into CalcBlockedDomains,
 rather than relying on remembering to call it before you call
 CalcBlockedDomains.

---
 advanced/Scripts/chronometer.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/advanced/Scripts/chronometer.sh b/advanced/Scripts/chronometer.sh
index b29480a9..54916d6e 100755
--- a/advanced/Scripts/chronometer.sh
+++ b/advanced/Scripts/chronometer.sh
@@ -15,6 +15,7 @@ gravity="/etc/pihole/gravity.list"
 today=$(date "+%b %e")
 
 function CalcBlockedDomains(){
+	CheckIPv6
 	if [ -e "$gravity" ]; then
 		#Are we IPV6 or IPV4?
 		if [[ -n $piholeIPv6 ]];then
@@ -66,7 +67,6 @@ function outputJSON(){
 	CalcblockedToday
 	CalcPercentBlockedToday
 	
-	CheckIPv6
 	CalcBlockedDomains
 	
 	printf '{"domains_being_blocked":"%s","dns_queries_today":"%s","ads_blocked_today":"%s","ads_percentage_today":"%s"}\n' "$blockedDomainsTotal" "$queriesToday" "$blockedToday" "$percentBlockedToday"

From bc51f88805a12c85e1b3e27ea42d3016ae16f4bc Mon Sep 17 00:00:00 2001
From: Promofaux <adzjwarner@gmail.com>
Date: Tue, 19 Jan 2016 22:52:29 +0000
Subject: [PATCH 2/2] Check if any list.* files exist from previous
 installation, if they do delete them.

---
 automated install/basic-install.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 82cfbf96..aa56b45d 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -271,6 +271,15 @@ installCron(){
 $SUDO curl -o /etc/cron.d/pihole https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/pihole.cron
 }
 
+tidyEtcPihole()
+{
+if ls /etc/pihole/list* 1> /dev/null 2>&1; then
+    echo "Cleaning up previous install"
+    $SUDO rm /etc/pihole/list.*
+fi
+
+}
+
 installPihole()
 {
 installDependencies
@@ -284,6 +293,7 @@ installConfigs
 installWebAdmin
 installPiholeWeb
 installCron
+tidyEtcPihole
 $SUDO /usr/local/bin/gravity.sh
 }