From 184d1bd0461a57df16c3d1b36e43998c607fb356 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Wed, 16 Dec 2015 11:23:44 -0600
Subject: [PATCH 01/29] fixes #126

These commands were left out, resulting in the Web interface not showing ads blocked despite the Pi-hole working.  It is just a permissions error.
---
 automated install/basic-install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 75572a70..b8d818a3 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -231,6 +231,9 @@ sudo wget https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/ww
 sudo unzip -oq /var/www/master.zip -d /var/www/html/
 sudo mv /var/www/html/AdminLTE-master /var/www/html/admin
 sudo rm /var/www/master.zip 2>/dev/null
+sudo touch /var/log/pihole.log
+sudo chmod 644 /var/log/pihole.log
+sudo chown dnsmasq:root /var/log/pihole.log
 }
 
 installPiholeWeb(){

From 3cdce17d28649b7100e4508884cceb24e54d9292 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Fri, 25 Dec 2015 21:14:19 -0600
Subject: [PATCH 02/29] adding more coverage

- Rob's post on medium.com
- TekThing video

Also posting about plans to partner up with Rob for his new service that can help reduce the flame war surrounding ad blocking
---
 README.md | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6e6f6a8f..7ddeb93d 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,13 @@ Once installed, **configure any device to use the Raspberry Pi as its DNS server
 
 [![Pi-hole exlplained](http://i.imgur.com/wd5ltCU.png)](https://vimeo.com/135965232)
 
-## Coverage
+## Video Coverage
+
+### TekThing
+
+Pi-hole is mentioned at the two minute mark
+
+[![Pi-hole on TekThing](http://img.youtube.com/vi/8Co59HU2gY0/0.jpg)](https://youtu.be/8Co59HU2gY0?t=2m)
 
 ### Security Now! Podcast
 Pi-hole is mentioned at 100 minutes and 26 seconds (the link brings you right there)
@@ -26,7 +32,16 @@ Pi-hole is mentioned at 100 minutes and 26 seconds (the link brings you right th
 
 ### Tech Blogs
 
-Featured on [MakeUseOf](http://www.makeuseof.com/tag/adblock-everywhere-raspberry-pi-hole-way/) and [Lifehacker](http://lifehacker.com/turn-a-raspberry-pi-into-an-ad-blocker-with-a-single-co-1686093533)!
+Pi-hole has been written about on:
+
+- [Medium](https://medium.com/@robleathern/block-ads-on-all-home-devices-for-53-18-a5f1ec139693#.gj1xpgr5d)
+- [MakeUseOf](http://www.makeuseof.com/tag/adblock-everywhere-raspberry-pi-hole-way/)
+- [Lifehacker](http://lifehacker.com/turn-a-raspberry-pi-into-an-ad-blocker-with-a-single-co-1686093533)!
+
+## Partnering With Optimal.com
+
+Pi-hole will be teaming up with [Rob Leathern's subscription service to avoid ads](https://medium.com/@robleathern/block-ads-on-all-home-devices-for-53-18-a5f1ec139693#.gj1xpgr5d).  This service is unique and will help content-creators and publishers [still make money from visitors who are using an ad ablocker](http://techcrunch.com/2015/12/17/the-new-optimal/).
+
 
 ## Technical Details
 

From a6313c9e9ef74aebfd0b12994582b4a40fd46d44 Mon Sep 17 00:00:00 2001
From: klaas01 <github@kla.as>
Date: Sat, 26 Dec 2015 14:37:51 -0400
Subject: [PATCH 03/29] Update gravity.sh

Fix kill command and only run as last step.
---
 gravity.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gravity.sh b/gravity.sh
index 3a146024..57882c55 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -239,8 +239,13 @@ function gravity_advanced() {
 	echo "** $numberOf domains being pulled in by gravity..."
 
 	gravity_unique
+}
 
-	sudo kill -s -HUP $(pidof dnsmasq)
+function gravity_reload() {
+	# Reload hosts file
+	
+	echo "** Refresh lists in dnsmasq..."
+	sudo kill -HUP $(pidof dnsmasq)
 }
 
 gravity_collapse
@@ -250,3 +255,4 @@ gravity_pulsar
 gravity_advanced
 gravity_hostFormat
 gravity_blackbody
+gravity_reload

From 26dcbfc1f99c1bf6a817f7754dabac03a066f26e Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sun, 27 Dec 2015 12:25:35 -0600
Subject: [PATCH 04/29] hide minor error

An error shows up on the first install that `latentWhitelist.txt` doesn't exist and can't be removed.  Redirecting STDERR should fix this.
---
 gravity.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gravity.sh b/gravity.sh
index 57882c55..1a8f48e8 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -183,7 +183,7 @@ function gravity_pulsar() {
         # regexp so it can be parsed out with grep -x
         awk -F '[# \t]' 'NF>0&&$1!="" {print "^"$1"$"}' $whitelist | sed 's/\./\\./g' > $latentWhitelist
 	else
-        rm $latentWhitelist >/dev/null
+        rm $latentWhitelist 2>/dev/null
 	fi
 
 	# Prevent our sources from being pulled into the hole

From b757e7a769447f60dd60cbe5cd65e2883556eefa Mon Sep 17 00:00:00 2001
From: Clinton Montague <clinton@slightlymore.co.uk>
Date: Mon, 28 Dec 2015 12:29:54 +0000
Subject: [PATCH 05/29] Fix typo in installer

IPv4 was mentioned in an IPv6 setting - changed to correctly reference IPv6.
---
 automated install/basic-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index b8d818a3..bbf1fbc2 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -97,7 +97,7 @@ use4andor6()
 # Let use select IPv4 and/or IPv6
 cmd=(whiptail --separate-output --checklist "Select Protocols" $r $c 2)
 options=(IPv4 "Block ads over IPv4" on
-         IPv6 "Block ads over IPv4" off)
+         IPv6 "Block ads over IPv6" off)
 choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
 for choice in $choices
 do

From 8ffa5e935739d6c34e5b22c825bbebc92f7f9ba5 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Wed, 30 Dec 2015 13:34:45 -0600
Subject: [PATCH 06/29] adding unRaid-hole fork

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 7ddeb93d..11cb3e79 100644
--- a/README.md
+++ b/README.md
@@ -79,5 +79,6 @@ This script will work for other UNIX-like systems with some slight **modificatio
 ### Examples Of The Pi-hole On Other Operating Systems
 - [Sky-Hole](http://dlaa.me/blog/post/skyhole)
 - [Pi-hole in the Cloud!](http://blog.codybunch.com/2015/07/28/Pi-Hole-in-the-cloud/)
+- [unRaid-hole](https://github.com/spants/unraidtemplates/blob/master/Spants/unRaid-hole.xml#L13)--[Repo and more info](http://lime-technology.com/forum/index.php?PHPSESSID=c0eae3e5ef7e521f7866034a3336489d&topic=38486.0)
 
 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif "AdminLTE Presentation")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3J2L3Z4DHW9UY "Donate")

From d646612a2597ae4a8da35e36ac0737dc012f0c41 Mon Sep 17 00:00:00 2001
From: Salmela <salmela@Tech-OSXSalmela.local>
Date: Thu, 31 Dec 2015 20:26:05 -0600
Subject: [PATCH 07/29] Block ads over IPv6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I’m pretty sure this works well.  Maybe someone else can try it out.
---
 automated install/basic-install.sh | 38 ++++++++++++++++--------------
 gravity.sh                         | 21 +++++++++++++----
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index bbf1fbc2..21b9c245 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -36,10 +36,6 @@ IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1
 IPv4addr=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}' | awk 'END {print}')
 IPv4gw=$(ip route get 8.8.8.8 | awk '{print $3}')
 
-# IPv6 support to be added later
-#IPv6eui64=$(ip addr show | awk '/scope\ global/ && /ff:fe/ {print $2}' | cut -d'/' -f1)
-#IPv6linkLocal=$(ip addr show | awk '/inet/ && /scope\ link/ && /fe80/ {print $2}' | cut -d'/' -f1)
-
 availableInterfaces=$(ip -o link | awk '{print $2}' | grep -v "lo" | cut -d':' -f1)
 dhcpcdFile=/etc/dhcpcd.conf
 
@@ -65,6 +61,9 @@ welcomeDialogs()
 # Display the welcome dialog
 whiptail --msgbox --backtitle "Welcome" --title "Pi-hole automated installer" "This installer will transform your Raspberry Pi into a network-wide ad blocker!" $r $c
 
+# Support for a part-time dev
+whiptail --msgbox --backtitle "Plea" --title "Free and open source" "The Pi-hole is free, but powered by your donations:  http://pi-hole.net/donate" $r $c
+
 # Explain the need for a static address
 whiptail --msgbox --backtitle "Initating network interface" --title "Static IP Needed" "The Pi-hole is a SERVER so it needs a STATIC IP ADDRESS to function properly.
 
@@ -116,7 +115,9 @@ done
 
 useIPv6dialog()
 {
-whiptail --msgbox --backtitle "Coming soon..." --title "IPv6 not yet supported" "I need your help for IPv6.  Consider donating at: http://pi-hole.net/donate" $r $c
+piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
+whiptail --msgbox --backtitle "IPv6..." --title "$piholeIPv6 will be used to block ads." $r $c
+sudo touch /etc/pihole/.useIPv6
 }
 
 getStaticIPv4Settings()
@@ -263,6 +264,17 @@ installCron
 sudo /usr/local/bin/gravity.sh
 }
 
+displayFinalMessage(){
+	whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Configure your devices to use the Pi-hole as their DNS server using:
+
+						$IPv4addr
+						$piholeIPv6
+
+	If you set a new IP address, you should restart the Pi.
+
+	The install log is in /etc/pihole." $r $c
+}
+
 ######## SCRIPT ############
 # Start the installer
 welcomeDialogs
@@ -288,16 +300,10 @@ fi
 
 # Decide is IPv6 will be used
 if [[ "$useIPv6" = true ]];then
-	# If only IPv6 is selected, exit because it is not supported yet
-	if [[ "$useIPv6" = true ]] && [[ "$useIPv4" = false ]];then
-		useIPv6dialog
-		exit
-	else
-		useIPv6dialog
-	fi
+	useIPv6dialog
 else
 	useIPv6=false
-	echo "IPv6 will NOT be used.  Consider a donation at pi-hole.net/donate"
+	echo "IPv6 will NOT be used."
 fi
 
 # Install and log everything to a file
@@ -306,11 +312,7 @@ installPihole | tee $tmpLog
 # Move the log file into /etc/pihole for storage
 sudo mv $tmpLog $instalLogLoc
 
-whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Configure your devices to use the Pi-hole as their DNS server using this IP: $IPv4addr.
-
-If you set a new IP address, it should work fine, but you may want to reboot the Pi at some point.
-
-The install log is in /etc/pihole." $r $c
+displayFinalMessage
 
 sudo service dnsmasq start
 sudo service lighttpd start
diff --git a/gravity.sh b/gravity.sh
index 1a8f48e8..c2a05534 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -11,15 +11,20 @@
 # (at your option) any later version.
 
 piholeIPfile=/tmp/piholeIP
+piholeIPv6file=/etc/pihole/.useIPv6
 if [[ -f $piholeIPfile ]];then
+  if [[ -f $piholeIPv6file ]];then
+    # If the file exists, then the user previously chose to use IPv6 in the automated installer
+    piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
+  fi
     # If the file exists, it means it was exported from the installation script and we should use that value instead of detecting it in this script
     piholeIP=$(cat $piholeIPfile)
     rm $piholeIPfile
 else
     # Otherwise, the IP address can be taken directly from the machine, which will happen when the script is run by the user and not the installation script
-	IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
-	piholeIPCIDR=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}' | awk 'END {print}')
-	piholeIP=${piholeIPCIDR%/*}
+    IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
+    piholeIPCIDR=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}' | awk 'END {print}')
+    piholeIP=${piholeIPCIDR%/*}
 fi
 
 # Ad-list sources--one per line in single quotes
@@ -208,7 +213,13 @@ function gravity_unique() {
 function gravity_hostFormat() {
 	# Format domain list as "192.168.x.x domain.com"
 	echo "** Formatting domains into a HOSTS file..."
-	cat $piholeDir/$eventHorizon | awk '{sub(/\r$/,""); print "'"$piholeIP"' " $0}' > $piholeDir/$accretionDisc
+  # 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
+    cat $piholeDir/$eventHorizon | awk -v ipv4addr="$piholeIP" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' > $piholeDir/$accretionDisc
+  else
+    # Otherwise, just create gravity.list as normal using IPv4
+    cat $piholeDir/$eventHorizon | awk -v ipv4addr="$piholeIP" '{sub(/\r$/,""); print ipv4addr" "$0}' > $piholeDir/$accretionDisc
+  fi
 	# Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
 	cp $piholeDir/$accretionDisc $adList
 }
@@ -243,7 +254,7 @@ function gravity_advanced() {
 
 function gravity_reload() {
 	# Reload hosts file
-	
+
 	echo "** Refresh lists in dnsmasq..."
 	sudo kill -HUP $(pidof dnsmasq)
 }

From 987e4e02a9bd62273b67eb07bb5ce670b14ec10f Mon Sep 17 00:00:00 2001
From: Clinton <iblamefish@gmail.com>
Date: Fri, 1 Jan 2016 14:11:46 +0000
Subject: [PATCH 08/29] Fix bug in gravity.sh where IPv6 list was not always
 populated

Failed to be populated if /tmp/piholeIP does not exist. This may happen under
the following conditions:

- was not generated during install
- gravity.sh being run again after the original install (the file is deleted
  during the installation process)
---
 gravity.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index c2a05534..091b5563 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -13,10 +13,6 @@
 piholeIPfile=/tmp/piholeIP
 piholeIPv6file=/etc/pihole/.useIPv6
 if [[ -f $piholeIPfile ]];then
-  if [[ -f $piholeIPv6file ]];then
-    # If the file exists, then the user previously chose to use IPv6 in the automated installer
-    piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
-  fi
     # If the file exists, it means it was exported from the installation script and we should use that value instead of detecting it in this script
     piholeIP=$(cat $piholeIPfile)
     rm $piholeIPfile
@@ -27,6 +23,11 @@ else
     piholeIP=${piholeIPCIDR%/*}
 fi
 
+if [[ -f $piholeIPv6file ]];then
+    # If the file exists, then the user previously chose to use IPv6 in the automated installer
+    piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
+fi
+
 # Ad-list sources--one per line in single quotes
 # The mahakala source is commented out due to many users having issues with it blocking legitimate domains.
 # Uncomment at your own risk

From d37db4304ca9194cca4ff6c515334dbb91307940 Mon Sep 17 00:00:00 2001
From: Salmela <salmela@Tech-OSXSalmela.local>
Date: Fri, 1 Jan 2016 10:59:30 -0600
Subject: [PATCH 09/29] A few small display changes

IPv6 box was missing the title.
Added some IPv6 echoes.
---
 automated install/basic-install.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 21b9c245..a529b40d 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -116,7 +116,8 @@ done
 useIPv6dialog()
 {
 piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
-whiptail --msgbox --backtitle "IPv6..." --title "$piholeIPv6 will be used to block ads." $r $c
+whiptail --msgbox --backtitle "IPv6..." --title "IPv6 Supported" "$piholeIPv6 will be used to block ads." $r $c
+sudo mkdir -p /etc/pihole/
 sudo touch /etc/pihole/.useIPv6
 }
 
@@ -270,9 +271,9 @@ displayFinalMessage(){
 						$IPv4addr
 						$piholeIPv6
 
-	If you set a new IP address, you should restart the Pi.
+If you set a new IP address, you should restart the Pi.
 
-	The install log is in /etc/pihole." $r $c
+The install log is in /etc/pihole." $r $c
 }
 
 ######## SCRIPT ############
@@ -301,6 +302,8 @@ fi
 # Decide is IPv6 will be used
 if [[ "$useIPv6" = true ]];then
 	useIPv6dialog
+	echo "Using IPv6."
+	echo "Your IPv6 address is: $piholeIPv6"
 else
 	useIPv6=false
 	echo "IPv6 will NOT be used."

From 89b88a2d5de156aaa5e5f7e5aa8c687c8d76bd5b Mon Sep 17 00:00:00 2001
From: Clinton <iblamefish@gmail.com>
Date: Sat, 2 Jan 2016 00:10:12 +0000
Subject: [PATCH 10/29] fixes #142 kill -HUP erroring on gravity_reload if
 dnsmasq is not running

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

diff --git a/gravity.sh b/gravity.sh
index 1a8f48e8..5f3cc84f 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -243,9 +243,17 @@ function gravity_advanced() {
 
 function gravity_reload() {
 	# Reload hosts file
-	
 	echo "** Refresh lists in dnsmasq..."
-	sudo kill -HUP $(pidof dnsmasq)
+
+	dnsmasqPid=$(pidof dnsmasq)
+
+	if [[ $dnsmasqPid ]]; then
+		# service already running - reload config
+		sudo kill -HUP $dnsmasqPid
+	else
+		# service not running, start it up
+		sudo service dnsmasq start
+	fi
 }
 
 gravity_collapse

From 3fc1817e7a3f880c82aceb54be34bc69a8222e50 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <salmela@Tech-OSXSalmela.local>
Date: Fri, 1 Jan 2016 18:34:33 -0600
Subject: [PATCH 11/29] Merge branch 'master' into ipv6

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

diff --git a/gravity.sh b/gravity.sh
index 091b5563..fbecb3ad 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -255,9 +255,17 @@ function gravity_advanced() {
 
 function gravity_reload() {
 	# Reload hosts file
-
 	echo "** Refresh lists in dnsmasq..."
-	sudo kill -HUP $(pidof dnsmasq)
+
+	dnsmasqPid=$(pidof dnsmasq)
+
+	if [[ $dnsmasqPid ]]; then
+		# service already running - reload config
+		sudo kill -HUP $dnsmasqPid
+	else
+		# service not running, start it up
+		sudo service dnsmasq start
+	fi
 }
 
 gravity_collapse

From bc3224e0b9fce6bb01510113f97e8c55d914c441 Mon Sep 17 00:00:00 2001
From: Clinton <iblamefish@gmail.com>
Date: Sat, 2 Jan 2016 22:10:26 +0000
Subject: [PATCH 12/29] installer - only select first (probably default)
 interface in list instead of all

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

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index a529b40d..ea7c882e 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -74,9 +74,16 @@ chooseInterface()
 {
 # Turn the available interfaces into an array so it can be used with a whiptail dialog
 interfacesArray=()
+firstloop=1
+
 while read -r line
 do
-interfacesArray+=("$line" "available" "ON")
+mode="OFF"
+if [[ $firstloop -eq 1 ]]; then
+  firstloop=0
+  mode="ON"
+fi
+interfacesArray+=("$line" "available" "$mode")
 done <<< "$availableInterfaces"
 
 # Find out how many interfaces are available to choose from

From 6f9d2d0567dfdf0286b6369d6fa26382a8fd0ba1 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sat, 2 Jan 2016 17:20:33 -0600
Subject: [PATCH 13/29] fixes #145

A much more elegant way to get the screen size.
---
 automated install/basic-install.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index ea7c882e..b80180cb 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -20,12 +20,9 @@
 tmpLog=/tmp/pihole-install.log
 instalLogLoc=/etc/pihole/install.log
 
-# Get the screen size in case we need a full-screen message and so we can display a dialog that is sized nicely
-screenSize=$(stty -a | tr \; \\012 | egrep 'rows|columns' | cut '-d ' -f3)
-
 # Find the rows and columns
-rows=$(stty -a | tr \; \\012 | egrep 'rows' | cut -d' ' -f3)
-columns=$(stty -a | tr \; \\012 | egrep 'columns' | cut -d' ' -f3)
+rows=$(tput lines)
+columns=$(tput cols)
 
 # Divide by two so the dialogs take up half of the screen, which looks nice.
 r=$(( rows / 2 ))

From 93664aeb4ec8406041200b6b3aadf670f0b12a5d Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Mon, 4 Jan 2016 20:32:46 -0600
Subject: [PATCH 14/29] cleaning up the readme

- removed most of the video images to reduce clutter
- converged the "coverage" and "video" sections into a bulleted list of links
- added a new project link (pi-hole on/off button)
- moved projects up in the page so it's easier to find and see what people are doing with Pi-hole
- removed custom conf section since it will be suited better in the wiki or FAQs
- added a help section
---
 README.md | 72 +++++++++++++++++++------------------------------------
 1 file changed, 24 insertions(+), 48 deletions(-)

diff --git a/README.md b/README.md
index 11cb3e79..4f8fe88c 100644
--- a/README.md
+++ b/README.md
@@ -1,57 +1,49 @@
 # Automated Install 
-#### Designed For Raspberry Pi B, B+, 2,
-##### and Zero (with an Ethernet adapter)
+##### Designed For Raspberry Pi B, B+, 2, and Zero (with an Ethernet adapter)
 
 1. Install Raspbian 
 2. Run the command below
 
 ### ```curl -L install.pi-hole.net | bash```
 
-![Pi-hole automated installation](http://i.imgur.com/Un7lBlj.png)
+Once installed, [configure your router to have **DHCP clients use the Pi as their DNS server**](http://pi-hole.net/faq/can-i-set-the-pi-hole-to-be-the-dns-server-at-my-router-so-i-dont-have-to-change-settings-for-my-devices/) and then any device that connects to your network will have ads blocked without any further configuration.  Alternatively, you can manually set each device to [use the Raspberry Pi as its DNS server](http://pi-hole.net/faq/how-do-i-use-the-pi-hole-as-my-dns-server/).
 
-Once installed, **configure any device to use the Raspberry Pi as its DNS server and the ads will be blocked**.  You can also configure your router's DHCP options to assign the Pi as clients DNS server so they do not need to do it manually.  
+## Pi-hole Is Free, But Powered By Your Donations
+[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif "Free, but powered by donations")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3J2L3Z4DHW9UY "Donate")
 
-[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif "AdminLTE Presentation")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3J2L3Z4DHW9UY "Donate")
-
-# How Does It Work?
+## How Does It Work?
 **Watch the 60-second video below to get a quick overview**
 
-[![Pi-hole exlplained](http://i.imgur.com/wd5ltCU.png)](https://vimeo.com/135965232)
+[![Pi-hole exlplained](http://i.imgur.com/qNybJDX.png)](https://vimeo.com/135965232)
 
-## Video Coverage
+## Pi-hole Projects
+- [Sky-Hole](http://dlaa.me/blog/post/skyhole)
+- [Pi-hole in the Cloud!](http://blog.codybunch.com/2015/07/28/Pi-Hole-in-the-cloud/)
+- [unRaid-hole](https://github.com/spants/unraidtemplates/blob/master/Spants/unRaid-hole.xml#L13)--[Repo and more info](http://lime-technology.com/forum/index.php?PHPSESSID=c0eae3e5ef7e521f7866034a3336489d&topic=38486.0)
+- [Pi-hole on/off button](http://thetimmy.silvernight.org/pages/endisbutton/)
 
-### TekThing
-
-Pi-hole is mentioned at the two minute mark
-
-[![Pi-hole on TekThing](http://img.youtube.com/vi/8Co59HU2gY0/0.jpg)](https://youtu.be/8Co59HU2gY0?t=2m)
-
-### Security Now! Podcast
-Pi-hole is mentioned at 100 minutes and 26 seconds (the link brings you right there)
-[![Pi-hole on Security Now!](http://img.youtube.com/vi/p7-osq_y8i8/0.jpg)](http://www.youtube.com/watch?v=p7-osq_y8i8&t=100m26s)
-
-### Tech Blogs
-
-Pi-hole has been written about on:
-
-- [Medium](https://medium.com/@robleathern/block-ads-on-all-home-devices-for-53-18-a5f1ec139693#.gj1xpgr5d)
-- [MakeUseOf](http://www.makeuseof.com/tag/adblock-everywhere-raspberry-pi-hole-way/)
-- [Lifehacker](http://lifehacker.com/turn-a-raspberry-pi-into-an-ad-blocker-with-a-single-co-1686093533)!
+## Coverage
+- [Medium: Block All Ads For $53](https://medium.com/@robleathern/block-ads-on-all-home-devices-for-53-18-a5f1ec139693#.gj1xpgr5d)
+- [MakeUseOf: Adblock Everywhere, The Pi-hole Way](http://www.makeuseof.com/tag/adblock-everywhere-raspberry-pi-hole-way/)
+- [Lifehacker: Turn Your Pi Into An Ad Blocker With A Single Command](http://lifehacker.com/turn-a-raspberry-pi-into-an-ad-blocker-with-a-single-co-1686093533)!
+- [Pi-hole on TekThing](https://youtu.be/8Co59HU2gY0?t=2m)
+- [Pi-hole on Security Now! Podcast](http://www.youtube.com/watch?v=p7-osq_y8i8&t=100m26s)
 
 ## Partnering With Optimal.com
 
 Pi-hole will be teaming up with [Rob Leathern's subscription service to avoid ads](https://medium.com/@robleathern/block-ads-on-all-home-devices-for-53-18-a5f1ec139693#.gj1xpgr5d).  This service is unique and will help content-creators and publishers [still make money from visitors who are using an ad ablocker](http://techcrunch.com/2015/12/17/the-new-optimal/).
 
-
 ## Technical Details
 
+The Pi-hole is an **advertising-aware DNS/Web server**.  If an ad domain is queried, a small Web page or GIF is delivered in place of the advertisement.
+
 A more detailed explanation of the installation can be found [here](http://jacobsalmela.com/block-millions-ads-network-wide-with-a-raspberry-pi-hole-2-0).
 
 ## Gravity
-The [gravity.sh](https://github.com/jacobsalmela/pi-hole/blob/master/gravity.sh) does most of the magic.  The script pulls in ad domains from many sources and compiles them into a single list of [over 1.6 million entries](http://jacobsalmela.com/block-millions-ads-network-wide-with-a-raspberry-pi-hole-2-0).
+The [gravity.sh](https://github.com/jacobsalmela/pi-hole/blob/master/gravity.sh) does most of the magic.  The script pulls in ad domains from many sources and compiles them into a single list of [over 1.6 million entries](http://jacobsalmela.com/block-millions-ads-network-wide-with-a-raspberry-pi-hole-2-0) (if you decide to use the [mahakala list](https://github.com/jacobsalmela/pi-hole/commit/963eacfe0537a7abddf30441c754c67ca1e40965)).
 
 ## Whitelist and blacklist
-You can add a `whitelist.txt` or `blacklist.txt` in `/etc/pihole/` and the script will apply those files automatically.
+You can add a `whitelist.txt` or `blacklist.txt` in `/etc/pihole/` and the script will apply those files automatically.  Put one domain per line.
 
 ## Web Interface
 The [Web interface](https://github.com/jacobsalmela/AdminLTE#pi-hole-admin-dashboard) will be installed automatically so you can view stats and change settings.  You can find it at:
@@ -60,25 +52,9 @@ The [Web interface](https://github.com/jacobsalmela/AdminLTE#pi-hole-admin-dashb
 
 ![Web](http://i.imgur.com/m114SCn.png)
 
-##  Custom Config File
-If you want to use your own variables for the gravity script (i.e. storing the files in a different location) and don't want to have to change them every time there is an update to the script, create a file called `/etc/pihole/pihole.conf`. In it, you should add your own variables in a similar fashion as shown below:
-
-```
-piholeDir=/var/run/pihole
-adList=/etc/dnsmasq.d/adList
-```
-
-See the [Wiki](https://github.com/jacobsalmela/pi-hole/wiki/Customization) entry for more details.
-
-### How It Works
-A technical and detailed description can be found [here](http://jacobsalmela.com/block-millions-ads-network-wide-with-a-raspberry-pi-hole-2-0)!
+## Help
+- See the [Wiki](https://github.com/jacobsalmela/pi-hole/wiki/Customization) entry for more details
+- There is also an [FAQ section on pi-hole.net](http://pi-hole.net)
 
 ## Other Operating Systems
 This script will work for other UNIX-like systems with some slight **modifications**.  As long as you can install `dnsmasq` and a Webserver, it should work OK.  The automated install only works for a clean install of Raspiban right now since that is how the project originated.
-
-### Examples Of The Pi-hole On Other Operating Systems
-- [Sky-Hole](http://dlaa.me/blog/post/skyhole)
-- [Pi-hole in the Cloud!](http://blog.codybunch.com/2015/07/28/Pi-Hole-in-the-cloud/)
-- [unRaid-hole](https://github.com/spants/unraidtemplates/blob/master/Spants/unRaid-hole.xml#L13)--[Repo and more info](http://lime-technology.com/forum/index.php?PHPSESSID=c0eae3e5ef7e521f7866034a3336489d&topic=38486.0)
-
-[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif "AdminLTE Presentation")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3J2L3Z4DHW9UY "Donate")

From cfd6e0d65d8fabbe37c5a605e3866077b04f49a1 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sun, 10 Jan 2016 10:40:58 -0600
Subject: [PATCH 15/29] more coverage and an API

---
 README.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4f8fe88c..e7a0adb4 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,9 @@ Once installed, [configure your router to have **DHCP clients use the Pi as thei
 - [Lifehacker: Turn Your Pi Into An Ad Blocker With A Single Command](http://lifehacker.com/turn-a-raspberry-pi-into-an-ad-blocker-with-a-single-co-1686093533)!
 - [Pi-hole on TekThing](https://youtu.be/8Co59HU2gY0?t=2m)
 - [Pi-hole on Security Now! Podcast](http://www.youtube.com/watch?v=p7-osq_y8i8&t=100m26s)
+- [Foolish Tech Show](https://youtu.be/bYyena0I9yc?t=2m4s)
+- [Pi-hole on Ubuntu](http://www.boyter.org/2015/12/pi-hole-ubuntu-14-04/)
+- [Catchpoint: iOS 9 Ad Blocking](http://blog.catchpoint.com/2015/09/14/ad-blocking-apple/)
 
 ## Partnering With Optimal.com
 
@@ -35,7 +38,7 @@ Pi-hole will be teaming up with [Rob Leathern's subscription service to avoid ad
 
 ## Technical Details
 
-The Pi-hole is an **advertising-aware DNS/Web server**.  If an ad domain is queried, a small Web page or GIF is delivered in place of the advertisement.
+The Pi-hole is an **advertising-aware DNS/Web server**.  If an ad domain is queried, a small Web page or GIF is delivered in place of the advertisement.  You can also [replace ads with any image you want](http://pi-hole.net/faq/is-it-possible-to-change-the-blank-page-that-takes-place-of-the-ads-to-something-else/) since it is just a simple Webpage taking place of the ads.
 
 A more detailed explanation of the installation can be found [here](http://jacobsalmela.com/block-millions-ads-network-wide-with-a-raspberry-pi-hole-2-0).
 
@@ -50,6 +53,18 @@ The [Web interface](https://github.com/jacobsalmela/AdminLTE#pi-hole-admin-dashb
 
 `http://192.168.1.x/admin/index.php`
 
+### API
+
+A basic read-only API can be accessed at `/admin/api.php`. It returns the following JSON:
+```JSON
+{
+	"domains_being_blocked": "136708",
+	"dns_queries_today": "18108",
+	"ads_blocked_today": "14648",
+	"ads_percentage_today": 80.892423238348
+}
+```
+
 ![Web](http://i.imgur.com/m114SCn.png)
 
 ## Help

From 802638ce8be382fb39e9407db048568ae798724b Mon Sep 17 00:00:00 2001
From: Josh Kastang <josh.kastang@gmail.com>
Date: Sun, 10 Jan 2016 19:08:29 +0000
Subject: [PATCH 16/29] replaces the non-repository managed web interface for
 pihole and keeps it updated

---
 automated install/webinterface.sh | 70 +++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 automated install/webinterface.sh

diff --git a/automated install/webinterface.sh b/automated install/webinterface.sh
new file mode 100644
index 00000000..bcd92c1e
--- /dev/null
+++ b/automated install/webinterface.sh	
@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+#
+# this script will update the pihole web interface files.
+#
+# if this is the first time running this script after an 
+# existing installation, the existing web interface files
+# will be removed and replaced with the latest master
+# branch from github. subsequent executions of this script
+# will pull the latest version of the web interface.
+#
+# @TODO: add git as requirement to basic-install.sh
+#
+
+WEB_INTERFACE_GIT_URL="https://github.com/jacobsalmela/AdminLTE.git"
+WEB_INTERFACE_DIR="/var/www/html/admin"
+
+main() {
+    prerequisites
+    if ! is_repo; then
+        make_repo
+    fi
+    update_repo
+}
+
+prerequisites() {
+
+    # must be root to update
+    if [[ $EUID -ne 0 ]]; then
+        sudo bash "$0" "$@"
+        exit $?
+    fi
+
+    # web interface must already exist. this is a (lazy)
+    # check to make sure pihole is actually installed.
+    if [ ! -d "$WEB_INTERFACE_DIR" ]; then
+        echo "$WEB_INTERFACE_DIR not found. Exiting."
+        exit 1
+    fi
+
+    if ! type "git" > /dev/null; then
+        apt-get -y install git
+    fi
+}
+
+is_repo() {
+    # if the web interface directory does not have a .git folder
+    # it means its using the master.zip archive from the install
+    # script.
+    if [ ! -d "$WEB_INTERFACE_DIR/.git" ]; then
+        return 1
+    fi
+    return 0
+}
+
+# removes the web interface installed from the master.zip archive and
+# replaces it with the current master branch from github
+make_repo() {
+    # remove the non-repod interface and clone the interface
+    rm -rf $WEB_INTERFACE_DIR
+    git clone "$WEB_INTERFACE_GIT_URL" "$WEB_INTERFACE_DIR"
+}
+
+# pulls the latest master branch from github
+update_repo() {
+    # pull the latest commits
+    cd "$WEB_INTERFACE_DIR"
+    git pull    
+}
+
+main

From 0ef0b0b6613535ae594dc872a4debab6baee2f5b Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sun, 10 Jan 2016 14:09:40 -0600
Subject: [PATCH 17/29] LCD real-time stats

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index e7a0adb4..2f3cb43b 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,12 @@ A basic read-only API can be accessed at `/admin/api.php`. It returns the follow
 
 ![Web](http://i.imgur.com/m114SCn.png)
 
+## Real-time Statistics
+
+You can view [real-time stats](http://pi-hole.net/faq/install-the-real-time-lcd-monitor-chronometer/) via `ssh` or on an [2.8" LCD screen](http://amzn.to/1P0q1Fj).  This is accomplished via [`chronometer.sh`](https://github.com/jacobsalmela/pi-hole/blob/master/advanced/Scripts/chronometer.sh).
+
+![Pi-hole LCD](http://i.imgur.com/nBEqycp.jpg)
+
 ## Help
 - See the [Wiki](https://github.com/jacobsalmela/pi-hole/wiki/Customization) entry for more details
 - There is also an [FAQ section on pi-hole.net](http://pi-hole.net)

From 4b1dd8a2a5645e9ab8893f8e5cff561449c21ca2 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Tue, 12 Jan 2016 17:44:08 -0600
Subject: [PATCH 18/29] fixes #158

Running at midnight, not 11:58 in the afternoon.
---
 advanced/pihole.cron | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/advanced/pihole.cron b/advanced/pihole.cron
index 47bc61fb..0a11a6d6 100644
--- a/advanced/pihole.cron
+++ b/advanced/pihole.cron
@@ -19,8 +19,8 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
 # Pi-hole: Parse the log file before it is flushed and save the stats to a database
 #          This will be used for a historical view of your Pi-hole's performance
-#50 11  * * *   root    /usr/local/bin/dailyLog.sh
+#50 23  * * *   root    /usr/local/bin/dailyLog.sh
 
 # Pi-hole: Flush the log daily at 11:58 so it doesn't get out of control
 #          Stats will be viewable in the Web interface thanks to the cron job above
-58 11   * * *   root    /usr/local/bin/piholeLogFlush.sh
+58 23   * * *   root    /usr/local/bin/piholeLogFlush.sh

From 9ff1129510e93ab7e9c83d121970cad192a95522 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Thu, 14 Jan 2016 17:11:16 -0600
Subject: [PATCH 19/29] Minibian Pi-hole

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2f3cb43b..1b7faffc 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ Once installed, [configure your router to have **DHCP clients use the Pi as thei
 - [Pi-hole in the Cloud!](http://blog.codybunch.com/2015/07/28/Pi-Hole-in-the-cloud/)
 - [unRaid-hole](https://github.com/spants/unraidtemplates/blob/master/Spants/unRaid-hole.xml#L13)--[Repo and more info](http://lime-technology.com/forum/index.php?PHPSESSID=c0eae3e5ef7e521f7866034a3336489d&topic=38486.0)
 - [Pi-hole on/off button](http://thetimmy.silvernight.org/pages/endisbutton/)
+- [Minibian Pi-hole](http://munkjensen.net/wiki/index.php/See_my_Pi-Hole#Minibian_Pi-hole)
 
 ## Coverage
 - [Medium: Block All Ads For $53](https://medium.com/@robleathern/block-ads-on-all-home-devices-for-53-18-a5f1ec139693#.gj1xpgr5d)

From 8ad116fe7bfa95b0640ad081859fee24cbb81b7e Mon Sep 17 00:00:00 2001
From: Adam Warner <adzjwarner@gmail.com>
Date: Fri, 15 Jan 2016 14:17:55 +0000
Subject: [PATCH 20/29] Aiming to get whitelist.sh to run either standalone or
 to be called from gravity.sh. Initial commit

---
 advanced/Scripts/whitelist.sh | 175 +++++++++++++++++++++++++++-------
 1 file changed, 139 insertions(+), 36 deletions(-)

diff --git a/advanced/Scripts/whitelist.sh b/advanced/Scripts/whitelist.sh
index f66f56d0..c4359748 100755
--- a/advanced/Scripts/whitelist.sh
+++ b/advanced/Scripts/whitelist.sh
@@ -7,51 +7,154 @@
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 
+if [[ $# = 0 ]]; then
+    echo "Immediately whitelists one or more domains in the hosts file"
+    echo "Usage: whitelist.sh domain1 [domain2 ...]"
+    exit 1
+fi
+
+#globals
 whitelist=/etc/pihole/whitelist.txt
 adList=/etc/pihole/gravity.list
-if [[ ! -f $whitelist ]];then
-    touch $whitelist
+reload=true
+addmode=true
+domList=()
+domToRemoveList=()
+
+piholeIPfile=/tmp/piholeIP
+piholeIPv6file=/etc/pihole/.useIPv6
+
+# Otherwise, the IP address can be taken directly from the machine, which will happen when the script is run by the user and not the installation script
+IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
+piholeIPCIDR=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}' | awk 'END {print}')
+piholeIP=${piholeIPCIDR%/*}
+
+modifyHost=false
+
+
+if [[ -f $piholeIPv6file ]];then
+    # If the file exists, then the user previously chose to use IPv6 in the automated installer
+    piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
 fi
 
-if [[ $# = 0 ]]; then
-    echo "Immediately whitelists one or more domains."
-    echo "Usage: whitelist.sh domain1 [domain2 ...]"
-fi
 
-combopattern=""
+function HandleOther(){	
+  #check validity of domain
+	validDomain=$(echo $1 | perl -ne'print if /\b((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}\b/')
+	
+	if [ -z "$validDomain" ]; then
+		echo $1 is not a valid argument or domain name
+	else	  
+	  domList=("${domList[@]}" $validDomain)
+	fi
+}
+
+function PopWhitelistFile(){
+	#check whitelist file exists, and if not, create it
+	if [[ ! -f $whitelist ]];then
+  	  touch $whitelist
+	fi	
+	for dom in "${domList[@]}"
+	do	  
+	  if $addmode; then
+	  	AddDomain $dom
+	  else
+	    RemoveDomain $dom
+	  fi
+	done
+}
+
+function AddDomain(){
+#| sed 's/\./\\./g'
+	bool=false
+	grep -Ex -q "$1" $whitelist || bool=true
+	if $bool; then
+	  #domain not found in the whitelist file, add it!
+	  echo "** Adding $1 to whitelist file"
+		echo $1 >> $whitelist
+		modifyHost=true
+	else
+		echo "** $1 already whitelisted! No need to add"
+	fi
+}
+
+function RemoveDomain(){
+  
+  bool=false
+  grep -Ex -q "$1" $whitelist || bool=true
+  if $bool; then
+  	#Domain is not in the whitelist file, no need to Remove
+  	echo "** $1 is NOT whitelisted! No need to remove"
+  else
+    #Domain is in the whitelist file, add to a temporary array and remove from whitelist file
+    echo "** Un-whitelisting $dom..."
+    domToRemoveList=("${domToRemoveList[@]}" $1)
+    modifyHost=true	  	
+  fi  	
+}
+
+function ModifyHostFile(){	
+	 if $addmode; then
+	    #remove domains in  from hosts file
+	    if [[ -r $whitelist ]];then
+        # Remove whitelist entries
+        numberOf=$(cat $whitelist | sed '/^\s*$/d' | wc -l)
+        plural=; [[ "$numberOf" != "1" ]] && plural=s
+        echo "** Whitelisting a total of $numberOf domain${plural}..."	   
+	  	  awk -F':' '{ print $1 }' $whitelist | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /[^.]'{}'(?!.)/;' $adList
+	  	fi
+	  else
+	    #we need to add the removed domains to the hosts file
+	    for rdom in "${domToRemoveList[@]}"
+	    do
+	    	if [[ -n $piholeIPv6 ]];then
+	    	  echo "**Blacklisting $rdom on IPv4 and IPv6"
+	    	  echo $rdom | awk -v ipv4addr="$piholeIP" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> $adList
+	      else
+	        echo "**Blacklisting $rdom on IPv4"
+	      	echo $rdom | awk -v ipv4addr="$piholeIP" '{sub(/\r$/,""); print ipv4addr" "$0}' >>$adList
+	      fi	      	      
+	      echo $rdom| sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /'{}'(?!.)/;' $whitelist
+	    done
+	  fi	
+}
+
+function Reload() {
+	# Reload hosts file
+	echo "** Refresh lists in dnsmasq..."
+
+	dnsmasqPid=$(pidof dnsmasq)
+
+	if [[ $dnsmasqPid ]]; then
+		# service already running - reload config
+		sudo kill -HUP $dnsmasqPid
+	else
+		# service not running, start it up
+		sudo service dnsmasq start
+	fi
+}
+
+###################################################
 
-# For each argument passed to this script
 for var in "$@"
 do
-  echo "Whitelisting $var..."
-
-  # Construct basic pattern to match domain name.
-  basicpattern=$(echo $var | awk -F '[# \t]' 'NF>0&&$1!="" {print ""$1""}' | sed 's/\./\\./g')
-
-  if [[ "$basicpattern" != "" ]]; then
-    # Add to the combination pattern that will be used below
-    if [[ "$combopattern" != "" ]]; then combopattern="$combopattern|"; fi
-    combopattern="$combopattern$basicpattern"
-
-    # Also add the domain to the whitelist but only if it's not already present
-    grep -E -q "^$basicpattern$" $whitelist \
-    || echo "$var" >> $whitelist
-  fi
+  case "$var" in
+    "-nr"| "--noreload"  ) reload=false;;        			
+    "-d" | "--delmode"   ) addmode=false;;  			
+    *                    ) HandleOther $var;;
+  esac
 done
 
-# Now report on and remove matched domains
-if [[ "$combopattern" != "" ]]; then
-  echo "Modifying hosts file..."
+PopWhitelistFile
 
-  # Construct pattern to match entry in hosts file.
-  # This consists of one or more IP addresses followed by the domain name.
-  pattern=$(echo $combopattern | awk -F '[# \t]' '{printf "%s", "^(([0-9]+\.){3}[0-9]+ +)+("$1")$"}')
-
-  # Output what will be removed and then actually remove
-  sed -r -n 's/'"$pattern"'/  Removed: \3/p' $adList
-  sed -r -i '/'"$pattern"'/d' $adList
-
-  echo "** $# domain(s) whitelisted."
-  # Force dnsmasq to reload /etc/pihole/gravity.list
-  kill -HUP $(pidof dnsmasq)
+if $modifyHost; then
+	echo "** Modifying Hosts File"
+	ModifyHostFile
+else
+	echo "** No changes need to be made"
+	exit 1
+fi
+
+if $reload; then
+	Reload
 fi

From 534dbc9b6e8aecf4d36ba648e46b00749eb570cd Mon Sep 17 00:00:00 2001
From: Adam Warner <adzjwarner@gmail.com>
Date: Fri, 15 Jan 2016 14:48:07 +0000
Subject: [PATCH 21/29] added a quiet option for when the script is called by
 gravity. Less output = less confusion!

---
 advanced/Scripts/whitelist.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/advanced/Scripts/whitelist.sh b/advanced/Scripts/whitelist.sh
index c4359748..43edcb9c 100755
--- a/advanced/Scripts/whitelist.sh
+++ b/advanced/Scripts/whitelist.sh
@@ -10,6 +10,10 @@
 if [[ $# = 0 ]]; then
     echo "Immediately whitelists one or more domains in the hosts file"
     echo "Usage: whitelist.sh domain1 [domain2 ...]"
+    echo "Options:"
+    echo "  -d, --delmode				Remove domains from the whitelist"
+    echo "  -nr, --noreload			Update Whitelist without refreshing dnsmasq
+    
     exit 1
 fi
 

From cc62d984d28410430c6aec60cc271acb53cd4aba Mon Sep 17 00:00:00 2001
From: Adam Warner <adzjwarner@gmail.com>
Date: Fri, 15 Jan 2016 14:49:16 +0000
Subject: [PATCH 22/29] Changed whitelist function to outsource to whitelist.sh

---
 gravity.sh | 59 ++++++++++++++++++++++++------------------------------
 1 file changed, 26 insertions(+), 33 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index fbecb3ad..28a2c61a 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -48,12 +48,11 @@ blacklist=$piholeDir/blacklist.txt
 whitelist=$piholeDir/whitelist.txt
 latentWhitelist=$piholeDir/latentWhitelist.txt
 justDomainsExtension=domains
-matter=$basename.0.matter.txt
-andLight=$basename.1.andLight.txt
-supernova=$basename.2.supernova.txt
-eventHorizon=$basename.3.eventHorizon.txt
-accretionDisc=$basename.4.accretionDisc.txt
-eyeOfTheNeedle=$basename.5.wormhole.txt
+matterandlight=$basename.0.matterandlight.txt
+supernova=$basename.1.supernova.txt
+eventHorizon=$basename.2.eventHorizon.txt
+accretionDisc=$basename.3.accretionDisc.txt
+eyeOfTheNeedle=$basename.4.wormhole.txt
 
 # After setting defaults, check if there's local overrides
 if [[ -r $piholeDir/pihole.conf ]];then
@@ -160,48 +159,39 @@ function gravity_Schwarzchild() {
 
 	# Find all active domains and compile them into one file and remove CRs
 	echo "** Aggregating list of domains..."
-	truncate -s 0 $piholeDir/$matter
+	truncate -s 0 $piholeDir/$matterandlight
 	for i in "${activeDomains[@]}"
 	do
-   		cat $i |tr -d '\r' >> $piholeDir/$matter
+   		cat $i |tr -d '\r' >> $piholeDir/$matterandlight
 	done
 }
 
-# Pulsar - White/blacklist application
-function gravity_pulsar() {
 
+function gravity_Blacklist(){
 	# Append blacklist entries if they exist
 	if [[ -r $blacklist ]];then
         numberOf=$(cat $blacklist | sed '/^\s*$/d' | wc -l)
         echo "** Blacklisting $numberOf domain(s)..."
-        cat $blacklist >> $piholeDir/$matter
+        cat $blacklist >> $piholeDir/$matterandlight
 	fi
+}
 
-	# Whitelist (if applicable) domains
-	if [[ -r $whitelist ]];then
-        # Remove whitelist entries
-        numberOf=$(cat $whitelist | sed '/^\s*$/d' | wc -l)
-        plural=; [[ "$numberOf" != "1" ]] && plural=s
-        echo "** Whitelisting $numberOf domain${plural}..."
-
-        # Append a "$" to the end, prepend a "^" to the beginning, and
-        # replace "." with "\." of each line to turn each entry into a
-        # regexp so it can be parsed out with grep -x
-        awk -F '[# \t]' 'NF>0&&$1!="" {print "^"$1"$"}' $whitelist | sed 's/\./\\./g' > $latentWhitelist
-	else
-        rm $latentWhitelist 2>/dev/null
-	fi
+function gravity_Whitelist() {
 
 	# Prevent our sources from being pulled into the hole
-	plural=; [[ "${#sources[@]}" != "1" ]] && plural=s
-	echo "** Whitelisting ${#sources[@]} ad list source${plural}..."
+	plural=; [[ "${sources[@]}" != "1" ]] && plural=s
+	echo "** Whitelisting ${sources[@]} ad list source${plural}..."
+	
+	urls=()
 	for url in ${sources[@]}
 	do
-        echo "$url" | awk -F '/' '{print "^"$3"$"}' | sed 's/\./\\./g' >> $latentWhitelist
+        tmp=$(echo "$url" | awk -F '/' '{print $3}'  | sed 's/\./\\./g')
+        urls=("${urls[@]}" $tmp)
 	done
+	
+	whitelist.sh -f -dr ${urls[@]}
 
-	# Remove whitelist entries from list
-	grep -vxf $latentWhitelist $piholeDir/$matter > $piholeDir/$andLight
+		
 }
 
 function gravity_unique() {
@@ -240,12 +230,13 @@ function gravity_blackbody() {
 }
 
 function gravity_advanced() {
+
+
 	# Remove comments and print only the domain name
 	# Most of the lists downloaded are already in hosts file format but the spacing/formating is not contigious
 	# This helps with that and makes it easier to read
 	# It also helps with debugging so each stage of the script can be researched more in depth
-	awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' $piholeDir/$andLight | \
-		sed -nr -e 's/\.{2,}/./g' -e '/\./p' >  $piholeDir/$supernova
+	awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' $piholeDir/$matterandlight | sed -nr -e 's/\.{2,}/./g' -e '/\./p' >  $piholeDir/$supernova
 
 	numberOf=$(wc -l < $piholeDir/$supernova)
 	echo "** $numberOf domains being pulled in by gravity..."
@@ -268,11 +259,13 @@ function gravity_reload() {
 	fi
 }
 
+
 gravity_collapse
 gravity_spinup
 gravity_Schwarzchild
-gravity_pulsar
 gravity_advanced
 gravity_hostFormat
 gravity_blackbody
+gravity_Whitelist
+gravity_Blacklist
 gravity_reload

From 14ee4850afda52fc3677c810ff88f3033205cd22 Mon Sep 17 00:00:00 2001
From: Adam Warner <adzjwarner@gmail.com>
Date: Fri, 15 Jan 2016 14:50:13 +0000
Subject: [PATCH 23/29] Placeholder for blacklist script

---
 advanced/Scripts/blacklist.sh | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 advanced/Scripts/blacklist.sh

diff --git a/advanced/Scripts/blacklist.sh b/advanced/Scripts/blacklist.sh
new file mode 100644
index 00000000..07dde06b
--- /dev/null
+++ b/advanced/Scripts/blacklist.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# (c) 2015 by Jacob Salmela
+# This file is part of Pi-hole.
+#
+# Pi-hole is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.

From 6b1f14647c3516e22b3d92a1d65d2ef681738a67 Mon Sep 17 00:00:00 2001
From: Adam Warner <adzjwarner@gmail.com>
Date: Fri, 15 Jan 2016 15:52:27 +0000
Subject: [PATCH 24/29] add reference to blacklist.sh

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

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index b80180cb..20570f22 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -207,8 +207,9 @@ installScripts(){
 sudo curl -o /usr/local/bin/gravity.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity.sh
 sudo curl -o /usr/local/bin/chronometer.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh
 sudo curl -o /usr/local/bin/whitelist.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/whitelist.sh
+sudo curl -o /usr/local/bin/blacklist.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/blacklist.sh
 sudo curl -o /usr/local/bin/piholeLogFlush.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/piholeLogFlush.sh
-sudo chmod 755 /usr/local/bin/{gravity,chronometer,whitelist,piholeLogFlush}.sh
+sudo chmod 755 /usr/local/bin/{gravity,chronometer,whitelist,blacklist,piholeLogFlush}.sh
 }
 
 installConfigs(){

From 89e3c25a90486b37acc4dbc45853b9d0508a1dcd Mon Sep 17 00:00:00 2001
From: Adam Warner <adzjwarner@gmail.com>
Date: Fri, 15 Jan 2016 15:53:40 +0000
Subject: [PATCH 25/29] Behaves like whitelist, but on the blacklist

---
 advanced/Scripts/blacklist.sh | 172 ++++++++++++++++++++++++++++++++++
 1 file changed, 172 insertions(+)

diff --git a/advanced/Scripts/blacklist.sh b/advanced/Scripts/blacklist.sh
index 07dde06b..9eac0780 100644
--- a/advanced/Scripts/blacklist.sh
+++ b/advanced/Scripts/blacklist.sh
@@ -6,3 +6,175 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
+
+if [[ $# = 0 ]]; then
+    echo "Immediately blacklists one or more domains in the hosts file"
+    echo "Usage: blacklist.sh domain1 [domain2 ...]"
+    echo "Options:"
+    echo "  -d, --delmode				Remove domains from the blacklist"
+    echo "  -nr, --noreload	Update blacklist without refreshing dnsmasq"
+    echo "  -f, --force		Force updating of the hosts files, even if there are no changes"
+    
+    exit 1
+fi
+
+#globals
+blacklist=/etc/pihole/blacklist.txt
+adList=/etc/pihole/gravity.list
+reload=true
+addmode=true
+force=false
+versbose=true
+domList=()
+domToRemoveList=()
+
+
+piholeIPfile=/tmp/piholeIP
+piholeIPv6file=/etc/pihole/.useIPv6
+
+# Otherwise, the IP address can be taken directly from the machine, which will happen when the script is run by the user and not the installation script
+IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
+piholeIPCIDR=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}' | awk 'END {print}')
+piholeIP=${piholeIPCIDR%/*}
+
+modifyHost=false
+
+
+if [[ -f $piholeIPv6file ]];then
+    # If the file exists, then the user previously chose to use IPv6 in the automated installer
+    piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
+fi
+
+
+function HandleOther(){	
+  #check validity of domain
+	validDomain=$(echo $1 | perl -ne'print if /\b((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}\b/')
+	
+	if [ -z "$validDomain" ]; then
+		echo $1 is not a valid argument or domain name
+	else	  
+	  domList=("${domList[@]}" $validDomain)
+	fi
+}
+
+function PopBlacklistFile(){
+	#check whitelist file exists, and if not, create it
+	if [[ ! -f $blacklist ]];then
+  	  touch $blacklist
+	fi	
+	for dom in "${domList[@]}"
+	do	  
+	  if $addmode; then
+	  	AddDomain $dom
+	  else
+	    RemoveDomain $dom
+	  fi
+	done
+}
+
+function AddDomain(){
+#| sed 's/\./\\./g'
+	bool=false
+	grep -Ex -q "$1" $blacklist || bool=true
+	if $bool; then
+	  #domain not found in the blacklist file, add it!
+	  if $versbose; then
+	  echo "** Adding $1 to blacklist file"
+	  fi
+		echo $1 >> $blacklist
+		modifyHost=true
+	else
+	if $versbose; then
+		echo "** $1 already blacklisted! No need to add"
+		fi
+	fi
+}
+
+function RemoveDomain(){
+  
+  bool=false
+  grep -Ex -q "$1" $blacklist || bool=true
+  if $bool; then
+  	#Domain is not in the blacklist file, no need to Remove
+  	if $versbose; then
+  	echo "** $1 is NOT blacklisted! No need to remove"
+  	fi
+  else
+    #Domain is in the blacklist file, add to a temporary array
+    if $versbose; then
+    echo "** Un-blacklisting $dom..."
+    fi
+    domToRemoveList=("${domToRemoveList[@]}" $1)    
+    modifyHost=true	  	
+  fi  	
+}
+
+function ModifyHostFile(){	
+	 if $addmode; then
+	    #add domains to the hosts file
+	    if [[ -r $blacklist ]];then
+	      numberOf=$(cat $blacklist | sed '/^\s*$/d' | wc -l)
+        plural=; [[ "$numberOf" != "1" ]] && plural=s
+        echo "** blacklisting a total of $numberOf domain${plural}..."	   		    
+	    	if [[ -n $piholeIPv6 ]];then	    	  
+	    	  cat $blacklist | awk -v ipv4addr="$piholeIP" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> $adList
+	      else	        
+	      	cat $blacklist | awk -v ipv4addr="$piholeIP" '{sub(/\r$/,""); print ipv4addr" "$0}' >>$adList
+	      fi		    
+		   
+	  	fi
+	  else
+
+	  for dom in "${domToRemoveList[@]}"
+		do	  
+	      #we need to remove the domains from the blacklist file and the host file	     
+	      echo $dom | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /[^.]'{}'(?!.)/;' $adList  
+	      echo $dom | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /'{}'(?!.)/;' $blacklist
+		done	  
+		fi
+	  
+}
+
+function Reload() {
+	# Reload hosts file
+	echo "** Refresh lists in dnsmasq..."
+
+	dnsmasqPid=$(pidof dnsmasq)
+
+	if [[ $dnsmasqPid ]]; then
+		# service already running - reload config
+		sudo kill -HUP $dnsmasqPid
+	else
+		# service not running, start it up
+		sudo service dnsmasq start
+	fi
+}
+
+###################################################
+
+for var in "$@"
+do
+  case "$var" in
+    "-nr"| "--noreload"  ) reload=false;;        			
+    "-d" | "--delmode"   ) addmode=false;;
+    "-f" | "--force"     ) force=true;;
+    "-q" | "--quiet"     ) versbose=false;;  			
+    *                    ) HandleOther $var;;
+  esac
+done
+
+PopBlacklistFile
+
+if $modifyHost || $force; then
+	echo "** Modifying Hosts File"
+	ModifyHostFile
+else
+  if $versbose; then
+	echo "** No changes need to be made"
+	fi
+	exit 1
+fi
+
+if $reload; then
+	Reload
+fi

From f68cf10efa9680dd63ccd2a3d239f569d1eebe17 Mon Sep 17 00:00:00 2001
From: Adam Warner <adzjwarner@gmail.com>
Date: Fri, 15 Jan 2016 15:54:00 +0000
Subject: [PATCH 26/29] Tidied up a couple of things

---
 advanced/Scripts/whitelist.sh | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/advanced/Scripts/whitelist.sh b/advanced/Scripts/whitelist.sh
index 43edcb9c..52a4ba66 100755
--- a/advanced/Scripts/whitelist.sh
+++ b/advanced/Scripts/whitelist.sh
@@ -9,10 +9,13 @@
 
 if [[ $# = 0 ]]; then
     echo "Immediately whitelists one or more domains in the hosts file"
+    echo " "
     echo "Usage: whitelist.sh domain1 [domain2 ...]"
+    echo "  "
     echo "Options:"
-    echo "  -d, --delmode				Remove domains from the whitelist"
-    echo "  -nr, --noreload			Update Whitelist without refreshing dnsmasq
+    echo "  -d, --delmode		Remove domains from the whitelist"
+    echo "  -nr, --noreload	Update Whitelist without refreshing dnsmasq"
+    echo "  -f, --force		Force updating of the hosts files, even if there are no changes"
     
     exit 1
 fi
@@ -22,6 +25,8 @@ whitelist=/etc/pihole/whitelist.txt
 adList=/etc/pihole/gravity.list
 reload=true
 addmode=true
+force=false
+versbose=true
 domList=()
 domToRemoveList=()
 
@@ -74,11 +79,15 @@ function AddDomain(){
 	grep -Ex -q "$1" $whitelist || bool=true
 	if $bool; then
 	  #domain not found in the whitelist file, add it!
+	  if $versbose; then
 	  echo "** Adding $1 to whitelist file"
+	  fi
 		echo $1 >> $whitelist
 		modifyHost=true
 	else
-		echo "** $1 already whitelisted! No need to add"
+		if $versbose; then
+			echo "** $1 already whitelisted! No need to add"
+		fi
 	fi
 }
 
@@ -88,10 +97,14 @@ function RemoveDomain(){
   grep -Ex -q "$1" $whitelist || bool=true
   if $bool; then
   	#Domain is not in the whitelist file, no need to Remove
+  	if $versbose; then
   	echo "** $1 is NOT whitelisted! No need to remove"
+  	fi
   else
     #Domain is in the whitelist file, add to a temporary array and remove from whitelist file
+    if $versbose; then
     echo "** Un-whitelisting $dom..."
+    fi
     domToRemoveList=("${domToRemoveList[@]}" $1)
     modifyHost=true	  	
   fi  	
@@ -144,19 +157,23 @@ for var in "$@"
 do
   case "$var" in
     "-nr"| "--noreload"  ) reload=false;;        			
-    "-d" | "--delmode"   ) addmode=false;;  			
+    "-d" | "--delmode"   ) addmode=false;;
+    "-f" | "--force"     ) force=true;;
+    "-q" | "--quiet"     ) versbose=false;;  			
     *                    ) HandleOther $var;;
   esac
 done
 
 PopWhitelistFile
 
-if $modifyHost; then
+if $modifyHost || $force; then
 	echo "** Modifying Hosts File"
 	ModifyHostFile
 else
+  if $versbose; then
 	echo "** No changes need to be made"
 	exit 1
+	fi
 fi
 
 if $reload; then

From 2284a27814e48c1f6d6b80379d03ec56a376ad3e Mon Sep 17 00:00:00 2001
From: Adam Warner <adzjwarner@gmail.com>
Date: Fri, 15 Jan 2016 15:54:11 +0000
Subject: [PATCH 27/29] Consumes blacklist.sh now, too.

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

diff --git a/gravity.sh b/gravity.sh
index 28a2c61a..2ee4ca33 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -169,27 +169,23 @@ function gravity_Schwarzchild() {
 
 function gravity_Blacklist(){
 	# Append blacklist entries if they exist
-	if [[ -r $blacklist ]];then
-        numberOf=$(cat $blacklist | sed '/^\s*$/d' | wc -l)
-        echo "** Blacklisting $numberOf domain(s)..."
-        cat $blacklist >> $piholeDir/$matterandlight
-	fi
+	blacklist.sh -f -nr -q
 }
 
 function gravity_Whitelist() {
 
 	# Prevent our sources from being pulled into the hole
 	plural=; [[ "${sources[@]}" != "1" ]] && plural=s
-	echo "** Whitelisting ${sources[@]} ad list source${plural}..."
+	echo "** Whitelisting ${#sources[@]} ad list source${plural}..."
 	
 	urls=()
 	for url in ${sources[@]}
 	do
-        tmp=$(echo "$url" | awk -F '/' '{print $3}'  | sed 's/\./\\./g')
+        tmp=$(echo "$url" | awk -F '/' '{print $3}')
         urls=("${urls[@]}" $tmp)
 	done
 	
-	whitelist.sh -f -dr ${urls[@]}
+	whitelist.sh -f -nr -q ${urls[@]}
 
 		
 }

From 2b0bee085bf0b66a292059d6854fadddd5f4ec98 Mon Sep 17 00:00:00 2001
From: Adam Warner <adzjwarner@gmail.com>
Date: Fri, 15 Jan 2016 18:57:20 +0000
Subject: [PATCH 28/29] Incorrect reference to whitelist in the blacklist.sh
 comments :)

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

diff --git a/advanced/Scripts/blacklist.sh b/advanced/Scripts/blacklist.sh
index 9eac0780..40bc224b 100644
--- a/advanced/Scripts/blacklist.sh
+++ b/advanced/Scripts/blacklist.sh
@@ -58,7 +58,7 @@ function HandleOther(){
 }
 
 function PopBlacklistFile(){
-	#check whitelist file exists, and if not, create it
+	#check blacklist file exists, and if not, create it
 	if [[ ! -f $blacklist ]];then
   	  touch $blacklist
 	fi	

From f9a2ca5c3235750fb45cd36561059230d9c8ef90 Mon Sep 17 00:00:00 2001
From: Promofaux <adzjwarner@gmail.com>
Date: Sat, 16 Jan 2016 00:47:45 +0000
Subject: [PATCH 29/29] Tidy up help text on both scripts. Add quiet help.

---
 advanced/Scripts/blacklist.sh | 6 ++++--
 advanced/Scripts/whitelist.sh | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/advanced/Scripts/blacklist.sh b/advanced/Scripts/blacklist.sh
index 40bc224b..3c3c78c6 100644
--- a/advanced/Scripts/blacklist.sh
+++ b/advanced/Scripts/blacklist.sh
@@ -9,12 +9,14 @@
 
 if [[ $# = 0 ]]; then
     echo "Immediately blacklists one or more domains in the hosts file"
+    echo " "
     echo "Usage: blacklist.sh domain1 [domain2 ...]"
+    echo "  "
     echo "Options:"
-    echo "  -d, --delmode				Remove domains from the blacklist"
+    echo "  -d, --delmode		Remove domains from the blacklist"
     echo "  -nr, --noreload	Update blacklist without refreshing dnsmasq"
     echo "  -f, --force		Force updating of the hosts files, even if there are no changes"
-    
+    echo "  -q, --quiet		output is less verbose"
     exit 1
 fi
 
diff --git a/advanced/Scripts/whitelist.sh b/advanced/Scripts/whitelist.sh
index fa699be0..8d871c51 100755
--- a/advanced/Scripts/whitelist.sh
+++ b/advanced/Scripts/whitelist.sh
@@ -16,7 +16,7 @@ if [[ $# = 0 ]]; then
     echo "  -d, --delmode		Remove domains from the whitelist"
     echo "  -nr, --noreload	Update Whitelist without refreshing dnsmasq"
     echo "  -f, --force		Force updating of the hosts files, even if there are no changes"
-    
+    echo "  -q, --quiet		output is less verbose"
     exit 1
 fi