From 1578a28363ec2bef64556b46427e04ea21b6f7bf Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Thu, 19 Nov 2015 19:36:34 -0600
Subject: [PATCH 01/29] pihole in the cloud link

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

diff --git a/README.md b/README.md
index 3e02f0d4..258168c2 100644
--- a/README.md
+++ b/README.md
@@ -63,5 +63,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/)
 
 [![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 d0e9e90ebeaf4638231d78470dd638d38542a0ac Mon Sep 17 00:00:00 2001
From: Cole Turner <turner.cole@gmail.com>
Date: Fri, 20 Nov 2015 22:53:43 -0500
Subject: [PATCH 02/29] pinholeIP should only use one IP

Updated piholeIP because if there are multiple network adapters, the gravity list will populate incorrectly with both IP addresses. Only one address should be used.
---
 gravity.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gravity.sh b/gravity.sh
index c6405c7d..c2d1ff92 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -8,7 +8,7 @@ if [[ -f $piholeIPfile ]];then
     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
-    piholeIP=$(ip -4 addr show | awk '{match($0,/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/); ip = substr($0,RSTART,RLENGTH); print ip}' | sed '/^\s*$/d' | grep -v "127.0.0.1")
+    piholeIP=$(ip -4 addr show | awk '{match($0,/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/); ip = substr($0,RSTART,RLENGTH); print ip}' | sed '/^\s*$/d' | grep -v "127.0.0.1" | (head -n1))
 fi
 
 # Ad-list sources--one per line in single quotes

From 4e50a03dfc6169bf691fae25f61e9fc3365272b3 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sat, 21 Nov 2015 13:29:03 -0600
Subject: [PATCH 03/29] uninstall script

This should remove the Pi-hole.
---
 automated install/uninstall.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 automated install/uninstall.sh

diff --git a/automated install/uninstall.sh b/automated install/uninstall.sh
new file mode 100644
index 00000000..b0dd3368
--- /dev/null
+++ b/automated install/uninstall.sh	
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Completely uninstalls the Pi-hole
+
+######### SCRIPT ###########
+sudo apt-get -y remove --purge dnsutils bc toilet
+sudo apt-get -y remove --purge dnsmasq
+sudo apt-get -y remove --purge lighttpd php5-common php5-cgi php5
+sudo rm -rf /var/www/html
+sudo rm /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
+sudo rm /etc/crontab
+sudo mv /etc/crontab.orig /etc/crontab
+sudo rm /etc/dnsmasq.conf
+sudo rm -rf /etc/lighttpd/
+sudo rm /var/log/pihole.log
+sudo rm /usr/local/bin/gravity.sh
+sudo rm /usr/local/bin/chronometer.sh
+sudo rm /usr/local/bin/whitelist.sh
+sudo rm /usr/local/bin/piholeLogFlush.sh
+sudo rm -rf /etc/pihole/

From f02c37ec07a33c60588823c0420a9e9888d4af7f Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@users.noreply.github.com>
Date: Sun, 22 Nov 2015 23:49:38 -0800
Subject: [PATCH 04/29] Start code refactor, eliminate some repetitive code

Begin code refactor prepatation, prevent DRY where possible.
---
 gravity.sh | 174 ++++++++++++++++++++---------------------------------
 1 file changed, 66 insertions(+), 108 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index 4c191c39..62a2cf2e 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -1,11 +1,18 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # http://pi-hole.net
 # Compiles a list of ad-serving domains by downloading them from multiple sources
-
-# This script should only be run after you have a static IP address set on the Pi
-piholeIP=$(hostname -I)
+piholeIPfile=/tmp/piholeIP
+if [[ -f $piholeIPfile ]];then
+    # 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
+    piholeIP=$(ip -4 addr show | awk '{match($0,/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/); ip = substr($0,RSTART,RLENGTH); print ip}' | sed '/^\s*$/d' | grep -v "127.0.0.1" | (head -n1))
+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
 sources=('https://adaway.org/hosts.txt'
 'http://adblock.gjtech.net/?format=unix-hosts'
 #'http://adblock.mahakala.is/'
@@ -16,139 +23,90 @@ sources=('https://adaway.org/hosts.txt'
 'http://winhelp2002.mvps.org/hosts.txt')
 
 # Variables for various stages of downloading and formatting the list
-adList=/etc/pihole/gravity.list
-origin=/etc/pihole
-piholeDir=/etc/pihole
-justDomainsExtension=domains
-matter=pihole.0.matter.txt
-andLight=pihole.1.andLight.txt
-supernova=pihole.2.supernova.txt
-eventHorizon=pihole.3.eventHorizon.txt
-accretionDisc=pihole.4.accretionDisc.txt
-eyeOfTheNeedle=pihole.5.wormhole.txt
+basename=pihole
+piholeDir=/etc/$basename
+adList=$piholeDir/gravity.list
 blacklist=$piholeDir/blacklist.txt
 whitelist=$piholeDir/whitelist.txt
-latentWhitelist=$origin/latentWhitelist.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
 
 # After setting defaults, check if there's local overrides
 if [[ -r $piholeDir/pihole.conf ]];then
     echo "** Local calibration requested..."
-	. $piholeDir/pihole.conf
+        . $piholeDir/pihole.conf
 fi
 echo "** Neutrino emissions detected..."
 
 # Create the pihole resource directory if it doesn't exist.  Future files will be stored here
 if [[ -d $piholeDir ]];then
-	:
+        :
 else
-	echo "** Creating pihole directory..."
-	sudo mkdir $piholeDir
+        echo "** Creating pihole directory..."
+        sudo mkdir $piholeDir
 fi
 
 # Loop through domain list.  Download each one and remove commented lines (lines beginning with '# 'or '/') and blank lines
 for ((i = 0; i < "${#sources[@]}"; i++))
 do
-	url=${sources[$i]}
-	# Get just the domain from the URL
-	domain=$(echo "$url" | cut -d'/' -f3)
+        url=${sources[$i]}
+        # Get just the domain from the URL
+        domain=$(echo "$url" | cut -d'/' -f3)
 
-	# Save the file as list.#.domain
-	saveLocation=$origin/list.$i.$domain.$justDomainsExtension
+        # Save the file as list.#.domain
+        saveLocation=$piholeDir/list.$i.$domain.$justDomainsExtension
 
-	agent="Mozilla/10.0"
+        agent="Mozilla/10.0"
 
-	echo -n "Getting $domain list... "
+        echo -n "Getting $domain list... "
 
-	# Use a case statement to download lists that need special cURL commands
-	# to complete properly and reset the user agent when required
-	case "$domain" in
-		"adblock.mahakala.is")
-			agent='Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0'
-			cmd="curl -e http://forum.xda-developers.com/"
-			;;
+        # Use a case statement to download lists that need special cURL commands
+        # to complete properly and reset the user agent when required
+        case "$domain" in
+                "adblock.mahakala.is")
+                        agent='Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0'
+                        cmd_ext="-e http://forum.xda-developers.com/"
+                        ;;
 
-		"pgl.yoyo.org")
-			cmd="curl -d mimetype=plaintext -d hostformat=hosts"
-			;;
+                "pgl.yoyo.org")
+        echo "** $numberOf domains being pulled in by gravity..."
 
-		# Default is a simple curl request
-		*) cmd="curl"
-	esac
+        # Remove carriage returns and preceding whitespace
+        # not really needed anymore?
+        cp $piholeDir/$andLight $piholeDir/$supernova
 
-	# tmp file, so we don't have to store the (long!) lists in RAM
-	patternBuffer=$(mktemp)
-	heisenbergCompensator=""
-	if [[ -r $saveLocation ]]; then
-		heisenbergCompensator="-z $saveLocation"
-	fi
-	CMD="$cmd -s $heisenbergCompensator -A '$agent' $url > $patternBuffer"
-	$cmd -s $heisenbergCompensator -A "$agent" $url > $patternBuffer
+        # Sort and remove duplicates
+        sort -u  $piholeDir/$supernova > $piholeDir/$eventHorizon
+        numberOf=$(wc -l < $piholeDir/$eventHorizon)
+        echo "** $numberOf unique domains trapped in the event horizon."
 
-
-	if [[ -s "$patternBuffer" ]];then
-		# 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}}' $patternBuffer | \
-			sed -nr -e 's/\.{2,}/./g' -e '/\./p' > $saveLocation
-		echo "Done."
-	else
-		echo "Skipping pattern because transporter logic detected no changes..."
-	fi
-
-	# Cleanup
-	rm -f $patternBuffer
-done
-
-# Find all files with the .domains extension and compile them into one file and remove CRs
-echo "** Aggregating list of domains..."
-find $origin/ -type f -name "*.$justDomainsExtension" -exec cat {} \; | tr -d '\r' > $origin/$matter
-
-# 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 >> $origin/$matter
-fi
-
-###########################
-function gravity_advanced() {
-
-	numberOf=$(wc -l < $origin/$andLight)
-	echo "** $numberOf domains being pulled in by gravity..."
-
-	# Remove carriage returns and preceding whitespace
-	# not really needed anymore?
-	cp $origin/$andLight $origin/$supernova
-
-	# Sort and remove duplicates
-	sort -u  $origin/$supernova > $origin/$eventHorizon
-	numberOf=$(wc -l < $origin/$eventHorizon)
-	echo "** $numberOf unique domains trapped in the event horizon."
-
-	# Format domain list as "192.168.x.x domain.com"
-	echo "** Formatting domains into a HOSTS file..."
-	awk '{print "'"$piholeIP"'" $1}' $origin/$eventHorizon > $origin/$accretionDisc
-
-	# Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
-	sudo cp $origin/$accretionDisc $adList
-	kill -HUP $(pidof dnsmasq)
+        # 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
+        # Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
+        sudo cp $piholeDir/$accretionDisc $adList
+        kill -HUP $(pidof dnsmasq)
 }
 
 # Whitelist (if applicable) then remove duplicates and format for dnsmasq
 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}..."
+        # 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
+        # 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
+        rm $latentWhitelist
 fi
 
 # Prevent our sources from being pulled into the hole
@@ -156,10 +114,10 @@ plural=; [[ "${#sources[@]}" != "1" ]] && plural=s
 echo "** Whitelisting ${#sources[@]} ad list source${plural}..."
 for url in ${sources[@]}
 do
-	echo "$url" | awk -F '/' '{print "^"$3"$"}' | sed 's/\./\\./g' >> $latentWhitelist
+        echo "$url" | awk -F '/' '{print "^"$3"$"}' | sed 's/\./\\./g' >> $latentWhitelist
 done
 
 # Remove whitelist entries from deduped list
-grep -vxf $latentWhitelist $origin/$matter > $origin/$andLight
+grep -vxf $latentWhitelist $piholeDir/$matter > $piholeDir/$andLight
 
 gravity_advanced

From 668d14e32d6b1f506d3ff34c41a561aa34855bfc Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@users.noreply.github.com>
Date: Mon, 23 Nov 2015 00:36:01 -0800
Subject: [PATCH 05/29] Add functions

Start to add functions for code reuse
---
 gravity.sh | 53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index 62a2cf2e..eb4c150f 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -46,36 +46,35 @@ echo "** Neutrino emissions detected..."
 
 # Create the pihole resource directory if it doesn't exist.  Future files will be stored here
 if [[ -d $piholeDir ]];then
-        :
+        # Temporary hack to allow non-root access to pihole directory
+        # Will update later, needed for existing installs, new installs should
+        # create this directory as non-root
+        sudo chmod 777 $piholeDir
+        find "$piholeDir" -type f -exec sudo chmod 666 {} \;
 else
         echo "** Creating pihole directory..."
-        sudo mkdir $piholeDir
+        mkdir $piholeDir
 fi
 
-# Loop through domain list.  Download each one and remove commented lines (lines beginning with '# 'or '/') and blank lines
-for ((i = 0; i < "${#sources[@]}"; i++))
-do
-        url=${sources[$i]}
-        # Get just the domain from the URL
-        domain=$(echo "$url" | cut -d'/' -f3)
+###########################
+function gravity_patterncheck() {
 
-        # Save the file as list.#.domain
-        saveLocation=$piholeDir/list.$i.$domain.$justDomainsExtension
+        patternBuffer=$1
 
-        agent="Mozilla/10.0"
-
-        echo -n "Getting $domain list... "
-
-        # Use a case statement to download lists that need special cURL commands
-        # to complete properly and reset the user agent when required
-        case "$domain" in
-                "adblock.mahakala.is")
-                        agent='Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0'
-                        cmd_ext="-e http://forum.xda-developers.com/"
-                        ;;
-
-                "pgl.yoyo.org")
-        echo "** $numberOf domains being pulled in by gravity..."
+        # check if the patternbuffer is a non-zero length file
+        if [[ -s "$patternBuffer" ]];then
+                # 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}}' $patternBuffer | \
+                        sed -nr -e 's/\.{2,}/./g' -e '/\./p' > $saveLocation
+                echo "Done."
+        else
+                # curl didn't download any host files, probably because of the date check
+                echo "Transporter logic detected no changes, pattern skipped..."
+        fi
+}
 
         # Remove carriage returns and preceding whitespace
         # not really needed anymore?
@@ -90,10 +89,12 @@ do
         echo "** Formatting domains into a HOSTS file..."
         cat $piholeDir/$eventHorizon | awk '{sub(/\r$/,""); print "'"$piholeIP"' " $0}' > $piholeDir/$accretionDisc
         # Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
-        sudo cp $piholeDir/$accretionDisc $adList
-        kill -HUP $(pidof dnsmasq)
+        cp $piholeDir/$accretionDisc $adList
+        sudo kill -HUP $(pidof dnsmasq)
 }
 
+gravity_spinup
+
 # Whitelist (if applicable) then remove duplicates and format for dnsmasq
 if [[ -r $whitelist ]];then
         # Remove whitelist entries

From a1e609d0059b1db0212494621cad0f824bb52315 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@users.noreply.github.com>
Date: Mon, 23 Nov 2015 01:16:00 -0800
Subject: [PATCH 06/29] Ugly hack permissions

Temporary hack for /etc/pihole directory and file permissions to pull out sudo requirement. (Irony is that is requires sudo.) This will be fixed later, but for now it's needed for existing installs so they don't break.
---
 gravity.sh | 58 +++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index eb4c150f..f3b8f828 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -57,10 +57,10 @@ else
 fi
 
 ###########################
-function gravity_patterncheck() {
-
+# patternCheck - check to see if curl downloaded any new files, and then process those
+# files so they are in host format.
+function gravity_patternCheck() {
         patternBuffer=$1
-
         # check if the patternbuffer is a non-zero length file
         if [[ -s "$patternBuffer" ]];then
                 # Remove comments and print only the domain name
@@ -76,6 +76,32 @@ function gravity_patterncheck() {
         fi
 }
 
+        # Use a case statement to download lists that need special cURL commands
+        # to complete properly and reset the user agent when required
+        case "$domain" in
+                "adblock.mahakala.is")
+                        agent='Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0'
+                        cmd_ext="-e http://forum.xda-developers.com/"
+                        ;;
+
+                "pgl.yoyo.org")
+                        cmd_ext="-d mimetype=plaintext -d hostformat=hosts"
+                        ;;
+
+                # Default is a simple request
+                *) cmd_ext=""
+        esac
+        gravity_transport $url $cmd_ext $agent
+done
+        # Compress files to singularity and white/blacklist
+        gravity_Schwarzchild
+}
+
+function gravity_advanced() {
+
+        numberOf=$(wc -l < $piholeDir/$andLight)
+        echo "** $numberOf domains being pulled in by gravity..."
+
         # Remove carriage returns and preceding whitespace
         # not really needed anymore?
         cp $piholeDir/$andLight $piholeDir/$supernova
@@ -95,30 +121,4 @@ function gravity_patterncheck() {
 
 gravity_spinup
 
-# Whitelist (if applicable) then remove duplicates and format for dnsmasq
-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
-fi
-
-# Prevent our sources from being pulled into the hole
-plural=; [[ "${#sources[@]}" != "1" ]] && plural=s
-echo "** Whitelisting ${#sources[@]} ad list source${plural}..."
-for url in ${sources[@]}
-do
-        echo "$url" | awk -F '/' '{print "^"$3"$"}' | sed 's/\./\\./g' >> $latentWhitelist
-done
-
-# Remove whitelist entries from deduped list
-grep -vxf $latentWhitelist $piholeDir/$matter > $piholeDir/$andLight
-
 gravity_advanced

From fe46afd08d2058899f34722e5113b67f8b8a320f Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@users.noreply.github.com>
Date: Mon, 23 Nov 2015 01:47:24 -0800
Subject: [PATCH 07/29] More functions

More refactoring
---
 gravity.sh | 73 +++++++++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index f3b8f828..9cb017d0 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -42,6 +42,10 @@ if [[ -r $piholeDir/pihole.conf ]];then
     echo "** Local calibration requested..."
         . $piholeDir/pihole.conf
 fi
+###########################
+# collapse - begin formation of pihole
+function gravity_collapse() {
+
 echo "** Neutrino emissions detected..."
 
 # Create the pihole resource directory if it doesn't exist.  Future files will be stored here
@@ -55,46 +59,42 @@ else
         echo "** Creating pihole directory..."
         mkdir $piholeDir
 fi
-
-###########################
-# patternCheck - check to see if curl downloaded any new files, and then process those
-# files so they are in host format.
-function gravity_patternCheck() {
-        patternBuffer=$1
-        # check if the patternbuffer is a non-zero length file
-        if [[ -s "$patternBuffer" ]];then
-                # 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}}' $patternBuffer | \
-                        sed -nr -e 's/\.{2,}/./g' -e '/\./p' > $saveLocation
-                echo "Done."
-        else
-                # curl didn't download any host files, probably because of the date check
-                echo "Transporter logic detected no changes, pattern skipped..."
-        fi
 }
 
-        # Use a case statement to download lists that need special cURL commands
-        # to complete properly and reset the user agent when required
-        case "$domain" in
-                "adblock.mahakala.is")
-                        agent='Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0'
-                        cmd_ext="-e http://forum.xda-developers.com/"
-                        ;;
+# spinup - main gravity function
+function gravity_spinup() {
 
-                "pgl.yoyo.org")
-                        cmd_ext="-d mimetype=plaintext -d hostformat=hosts"
-                        ;;
+# Loop through domain list.  Download each one and remove commented lines (lines beginning with '# 'or '/') and blank lines
+for ((i = 0; i < "${#sources[@]}"; i++))
+do
+        url=${sources[$i]}
+        # Get just the domain from the URL
+# 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}..."
 
-                # Default is a simple request
-                *) cmd_ext=""
-        esac
-        gravity_transport $url $cmd_ext $agent
+        # 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
+fi
+
+# Prevent our sources from being pulled into the hole
+plural=; [[ "${#sources[@]}" != "1" ]] && plural=s
+echo "** Whitelisting ${#sources[@]} ad list source${plural}..."
+for url in ${sources[@]}
+do
+        echo "$url" | awk -F '/' '{print "^"$3"$"}' | sed 's/\./\\./g' >> $latentWhitelist
 done
-        # Compress files to singularity and white/blacklist
-        gravity_Schwarzchild
+
+# Remove whitelist entries from list
+grep -vxf $latentWhitelist $piholeDir/$matter > $piholeDir/$andLight
+
 }
 
 function gravity_advanced() {
@@ -120,5 +120,6 @@ function gravity_advanced() {
 }
 
 gravity_spinup
-
+gravity_transport
+gravity_Schwartzchild
 gravity_advanced

From af909e0ee67bf5893e476c047c40e78a0085678c Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@users.noreply.github.com>
Date: Mon, 23 Nov 2015 02:52:12 -0800
Subject: [PATCH 08/29] Copyright issues

Some of the blocklists are copyright and need to be pulled and stored as is. They can be processed further in the script to remove comments.
---
 gravity.sh | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 90 insertions(+), 6 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index 9cb017d0..f8f91bd3 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Pi-hole: A black hole for Internet advertisements
+# (c) 2015 by Jacob Salmela GPL 2.0
+# Network-wide ad blocking via your Raspberry Pi
 # http://pi-hole.net
 # Compiles a list of ad-serving domains by downloading them from multiple sources
 piholeIPfile=/tmp/piholeIP
@@ -45,7 +48,6 @@ fi
 ###########################
 # collapse - begin formation of pihole
 function gravity_collapse() {
-
 echo "** Neutrino emissions detected..."
 
 # Create the pihole resource directory if it doesn't exist.  Future files will be stored here
@@ -61,6 +63,44 @@ else
 fi
 }
 
+# patternCheck - check to see if curl downloaded any new files, and then process those
+# files so they are in host format.
+function gravity_patternCheck() {
+        patternBuffer=$1
+        # check if the patternbuffer is a non-zero length file
+        if [[ -s "$patternBuffer" ]];then
+                # Some of the blocklists are copyright, they need to be downloaded
+                # and stored as is. They can be processed for content after they
+                # have been saved.
+                cp $patternBuffer $saveLocation
+                echo "Done."
+        else
+                # curl didn't download any host files, probably because of the date check
+                echo "Transporter logic detected no changes, pattern skipped..."
+        fi
+}
+
+# transport - curl the specified url with any needed command extentions, then patternCheck
+function gravity_transport() {
+        url=$1
+        cmd_ext=$2
+        agent=$3
+        # tmp file, so we don't have to store the (long!) lists in RAM
+        patternBuffer=$(mktemp)
+        heisenbergCompensator=""
+        if [[ -r $saveLocation ]]; then
+                # if domain has been saved, add file for date check to only download newer
+                heisenbergCompensator="-z $saveLocation"
+        fi
+        # Silently curl url
+        curl -s $cmd_ext $heisenbergCompensator -A "$agent" $url > $patternBuffer
+
+        gravity_patternCheck $patternBuffer
+
+        # Cleanup
+        rm -f $patternBuffer
+
+}
 # spinup - main gravity function
 function gravity_spinup() {
 
@@ -69,6 +109,48 @@ for ((i = 0; i < "${#sources[@]}"; i++))
 do
         url=${sources[$i]}
         # Get just the domain from the URL
+        domain=$(echo "$url" | cut -d'/' -f3)
+
+        # Save the file as list.#.domain
+        saveLocation=$piholeDir/list.$i.$domain.$justDomainsExtension
+
+        agent="Mozilla/10.0"
+
+        echo -n "Getting $domain list... "
+
+        # Use a case statement to download lists that need special cURL commands
+        # to complete properly and reset the user agent when required
+        case "$domain" in
+                "adblock.mahakala.is")
+                        agent='Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0'
+                        cmd_ext="-e http://forum.xda-developers.com/"
+                        ;;
+
+                "pgl.yoyo.org")
+                        cmd_ext="-d mimetype=plaintext -d hostformat=hosts"
+                        ;;
+
+                # Default is a simple request
+                *) cmd_ext=""
+        esac
+        gravity_transport $url $cmd_ext $agent
+done
+}
+
+# Schwarzchild - aggregate domains to one list, and then white/blacklist unified list
+function gravity_Schwarzchild() {
+
+# Find all files with the .domains extension and compile them into one file and remove CRs
+echo "** Aggregating list of domains..."
+find $piholeDir/ -type f -name "*.$justDomainsExtension" -exec cat {} \; | tr -d '\r' > $piholeDir/$matter
+
+# 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
+fi
+
 # Whitelist (if applicable) domains
 if [[ -r $whitelist ]];then
         # Remove whitelist entries
@@ -102,9 +184,12 @@ function gravity_advanced() {
         numberOf=$(wc -l < $piholeDir/$andLight)
         echo "** $numberOf domains being pulled in by gravity..."
 
-        # Remove carriage returns and preceding whitespace
-        # not really needed anymore?
-        cp $piholeDir/$andLight $piholeDir/$supernova
+        # 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
 
         # Sort and remove duplicates
         sort -u  $piholeDir/$supernova > $piholeDir/$eventHorizon
@@ -120,6 +205,5 @@ function gravity_advanced() {
 }
 
 gravity_spinup
-gravity_transport
-gravity_Schwartzchild
+gravity_Schwarzchild
 gravity_advanced

From 4f1bb12d36b64c239cb1ed2bb3f117bb64995498 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@users.noreply.github.com>
Date: Mon, 23 Nov 2015 03:11:16 -0800
Subject: [PATCH 09/29] More functions

Splitting into more functions
---
 gravity.sh | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index f8f91bd3..4a57112f 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -179,6 +179,19 @@ grep -vxf $latentWhitelist $piholeDir/$matter > $piholeDir/$andLight
 
 }
 
+function gravity_unique() {
+        # Sort and remove duplicates
+        sort -u  $piholeDir/$supernova > $piholeDir/$eventHorizon
+        numberOf=$(wc -l < $piholeDir/$eventHorizon)
+        echo "** $numberOf unique domains trapped in the event horizon."
+}
+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
+        # Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
+        cp $piholeDir/$accretionDisc $adList
+}
 function gravity_advanced() {
 
         numberOf=$(wc -l < $piholeDir/$andLight)
@@ -191,19 +204,11 @@ function gravity_advanced() {
         awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' $piholeDir/$andLight | \
                         sed -nr -e 's/\.{2,}/./g' -e '/\./p' >  $piholeDir/$supernova
 
-        # Sort and remove duplicates
-        sort -u  $piholeDir/$supernova > $piholeDir/$eventHorizon
-        numberOf=$(wc -l < $piholeDir/$eventHorizon)
-        echo "** $numberOf unique domains trapped in the event horizon."
-
-        # 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
-        # Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
-        cp $piholeDir/$accretionDisc $adList
         sudo kill -HUP $(pidof dnsmasq)
 }
 
 gravity_spinup
 gravity_Schwarzchild
+gravity_unique
+gravity_hostFormat
 gravity_advanced

From a5d29a1048f1629b7854dc8cefe25675b904b088 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@users.noreply.github.com>
Date: Mon, 23 Nov 2015 03:26:10 -0800
Subject: [PATCH 10/29] Fix function ordering

Unique is now called after the comments are scrubbed from the unified domain list.
---
 gravity.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index 4a57112f..af1e98dc 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -137,7 +137,7 @@ do
 done
 }
 
-# Schwarzchild - aggregate domains to one list, and then white/blacklist unified list
+# Schwarzchild - aggregate domains to one list and add blacklisted domains
 function gravity_Schwarzchild() {
 
 # Find all files with the .domains extension and compile them into one file and remove CRs
@@ -150,6 +150,9 @@ if [[ -r $blacklist ]];then
         echo "** Blacklisting $numberOf domain(s)..."
         cat $blacklist >> $piholeDir/$matter
 fi
+}
+
+function gravity_pulsar() {
 
 # Whitelist (if applicable) domains
 if [[ -r $whitelist ]];then
@@ -176,7 +179,6 @@ done
 
 # Remove whitelist entries from list
 grep -vxf $latentWhitelist $piholeDir/$matter > $piholeDir/$andLight
-
 }
 
 function gravity_unique() {
@@ -194,9 +196,6 @@ function gravity_hostFormat() {
 }
 function gravity_advanced() {
 
-        numberOf=$(wc -l < $piholeDir/$andLight)
-        echo "** $numberOf domains being pulled in by gravity..."
-
         # 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
@@ -204,11 +203,16 @@ function gravity_advanced() {
         awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' $piholeDir/$andLight | \
                         sed -nr -e 's/\.{2,}/./g' -e '/\./p' >  $piholeDir/$supernova
 
+        numberOf=$(wc -l < $piholeDir/$supernova)
+        echo "** $numberOf domains being pulled in by gravity..."
+        gravity_unique
+
         sudo kill -HUP $(pidof dnsmasq)
 }
 
 gravity_spinup
 gravity_Schwarzchild
-gravity_unique
+gravity_pulsar
 gravity_hostFormat
 gravity_advanced
+

From e2b518568ea1477068a90587c4dedf0d5859ee9b Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@users.noreply.github.com>
Date: Mon, 23 Nov 2015 12:39:47 -0800
Subject: [PATCH 11/29] Forgot to start the directory check function

---
 gravity.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gravity.sh b/gravity.sh
index af1e98dc..e3337e42 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -210,6 +210,7 @@ function gravity_advanced() {
         sudo kill -HUP $(pidof dnsmasq)
 }
 
+gravity_collapse
 gravity_spinup
 gravity_Schwarzchild
 gravity_pulsar

From 20399b82620a67a2322a4da51feb79e1620062e4 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@users.noreply.github.com>
Date: Mon, 23 Nov 2015 13:12:11 -0800
Subject: [PATCH 12/29] Build array of active domains to concatenate

Fix #86 Builds an array of active domains, and then loops through that list to pick files to concatenate after truncating Matter.
---
 gravity.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index e3337e42..ae20d439 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -113,6 +113,7 @@ do
 
         # Save the file as list.#.domain
         saveLocation=$piholeDir/list.$i.$domain.$justDomainsExtension
+        activeDomains[$i]=$saveLocation
 
         agent="Mozilla/10.0"
 
@@ -140,9 +141,13 @@ done
 # Schwarzchild - aggregate domains to one list and add blacklisted domains
 function gravity_Schwarzchild() {
 
-# Find all files with the .domains extension and compile them into one file and remove CRs
+# Find all active domains and compile them into one file and remove CRs
 echo "** Aggregating list of domains..."
-find $piholeDir/ -type f -name "*.$justDomainsExtension" -exec cat {} \; | tr -d '\r' > $piholeDir/$matter
+truncate -s 0 $piholeDir/$matter
+for i in "${activeDomains[@]}"
+do
+   cat $i |tr -d '\r' >> $piholeDir/$matter
+done
 
 # Append blacklist entries if they exist
 if [[ -r $blacklist ]];then

From 04f6c478ccd1f3d651dd858d9cb77339217eef2f Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sun, 15 Nov 2015 20:54:15 -0600
Subject: [PATCH 13/29] Updated install instructions

Also a screenshot of the dialog-based installer
---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 09b88524..3e02f0d4 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,11 @@
 # Automated Install
 
 1. Install Raspbian 
-2. Set a **static** IP address
-3. Run the command below
+2. Run the command below
 
-```curl -L install.pi-hole.net | bash```
+### ```curl -L install.pi-hole.net | bash```
+
+![Pi-hole automated installation](http://i.imgur.com/Un7lBlj.png)
 
 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.  
 

From ecb514dd0a206176876b6cba59b4b8ae9a1001be Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Thu, 19 Nov 2015 19:36:34 -0600
Subject: [PATCH 14/29] pihole in the cloud link

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

diff --git a/README.md b/README.md
index 3e02f0d4..258168c2 100644
--- a/README.md
+++ b/README.md
@@ -63,5 +63,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/)
 
 [![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 03bbef07b5ef08c7005bade5b634d303149c5f58 Mon Sep 17 00:00:00 2001
From: Cole Turner <turner.cole@gmail.com>
Date: Fri, 20 Nov 2015 22:53:43 -0500
Subject: [PATCH 15/29] pinholeIP should only use one IP

Updated piholeIP because if there are multiple network adapters, the gravity list will populate incorrectly with both IP addresses. Only one address should be used.
---
 gravity.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gravity.sh b/gravity.sh
index c6405c7d..c2d1ff92 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -8,7 +8,7 @@ if [[ -f $piholeIPfile ]];then
     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
-    piholeIP=$(ip -4 addr show | awk '{match($0,/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/); ip = substr($0,RSTART,RLENGTH); print ip}' | sed '/^\s*$/d' | grep -v "127.0.0.1")
+    piholeIP=$(ip -4 addr show | awk '{match($0,/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/); ip = substr($0,RSTART,RLENGTH); print ip}' | sed '/^\s*$/d' | grep -v "127.0.0.1" | (head -n1))
 fi
 
 # Ad-list sources--one per line in single quotes

From 464003d6741c81a6bc969db90eb4b34bb9932413 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sat, 21 Nov 2015 13:29:03 -0600
Subject: [PATCH 16/29] uninstall script

This should remove the Pi-hole.
---
 automated install/uninstall.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 automated install/uninstall.sh

diff --git a/automated install/uninstall.sh b/automated install/uninstall.sh
new file mode 100644
index 00000000..b0dd3368
--- /dev/null
+++ b/automated install/uninstall.sh	
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Completely uninstalls the Pi-hole
+
+######### SCRIPT ###########
+sudo apt-get -y remove --purge dnsutils bc toilet
+sudo apt-get -y remove --purge dnsmasq
+sudo apt-get -y remove --purge lighttpd php5-common php5-cgi php5
+sudo rm -rf /var/www/html
+sudo rm /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
+sudo rm /etc/crontab
+sudo mv /etc/crontab.orig /etc/crontab
+sudo rm /etc/dnsmasq.conf
+sudo rm -rf /etc/lighttpd/
+sudo rm /var/log/pihole.log
+sudo rm /usr/local/bin/gravity.sh
+sudo rm /usr/local/bin/chronometer.sh
+sudo rm /usr/local/bin/whitelist.sh
+sudo rm /usr/local/bin/piholeLogFlush.sh
+sudo rm -rf /etc/pihole/

From 29ae66c6db1d8748ba54fc79a9ec12dc56211afb Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@ganymeade.com>
Date: Wed, 25 Nov 2015 13:43:59 -0800
Subject: [PATCH 17/29] Check IP info for outgoing interface

---
 automated install/basic-install.sh | 46 ++++++++++++------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index f0a7d139..2609973f 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
 # by Jacob Salmela
 # Network-wide ad blocking via your Raspberry Pi
@@ -24,9 +24,11 @@ columns=$(stty -a | tr \; \\012 | egrep 'columns' | cut -d' ' -f3)
 r=$(( rows / 2 ))
 c=$(( columns / 2 ))
 
-IPv4addr=$(ip -4 addr show | awk '{match($0,/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/); ip = substr($0,RSTART,RLENGTH); print ip}' | sed '/^\s*$/d' | grep -v "127.0.0.1")
-IPv4mask=$(ifconfig | awk -F':' '/inet addr/ && !/127.0.0.1/ {print $4}')
-IPv4gw=$(ip route show | awk '/default\ via/ {print $3}')
+# Find IP used to route to outside world
+IPv4info=$(ip route get 8.8.8.8)
+IPv4dev=$(echo $IPv4info| awk '{print $5}')
+IPv4addr=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}')
+IPv4gw=$(echo $IPv4info | awk '{print $3}')
 
 # IPv6 support to be added later
 #IPv6eui64=$(ip addr show | awk '/scope\ global/ && /ff:fe/ {print $2}' | cut -d'/' -f1)
@@ -117,7 +119,6 @@ getStaticIPv4Settings()
 if (whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Do you want to use your current network settings as a static address?
 
 								IP address:    $IPv4addr
-								Subnet mask:   $IPv4mask
 								Gateway:       $IPv4gw" $r $c) then
 	# If they choose yes, let the user know that the IP address will not be available via DHCP and may cause a conflict.
 	whiptail --msgbox --backtitle "IP information" --title "FYI: IP Conflict" "It is possible your router could still try to assign this IP to a device, which would cause a conflict.  But in most cases the router is smart enough to not do that.
@@ -138,22 +139,17 @@ else
 	IPv4addr=$(whiptail --backtitle "Calibrating network interface" --title "IPv4 address" --inputbox "Enter your desired IPv4 address" $r $c $IPv4addr 3>&1 1>&2 2>&3)
 	if [[ $? = 0 ]];then
     	echo "Your static IPv4 address:    $IPv4addr"
-		# Ask for the subnet mask
-		IPv4mask=$(whiptail --backtitle "Calibrating network interface" --title "IPv4 netmask" --inputbox "Enter your desired IPv4 subnet mask" $r $c $IPv4mask 3>&1 1>&2 2>&3)
-		if [[ $? = 0 ]];then
-			echo "Your static IPv4 netmask:    $IPv4mask"
-			# Ask for the gateway
+		# Ask for the gateway
 			IPv4gw=$(whiptail --backtitle "Calibrating network interface" --title "IPv4 gateway (router)" --inputbox "Enter your desired IPv4 default gateway" $r $c $IPv4gw 3>&1 1>&2 2>&3)
 			if [[ $? = 0 ]];then
 				echo "Your static IPv4 gateway:    $IPv4gw"
 				# Give the user a chance to review their settings before moving on
 				if (whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Are these settings correct?
 					IP address:    $IPv4addr
-					Subnet mask:   $IPv4mask
 					Gateway:       $IPv4gw" $r $c)then
 					# If the settings are correct, then we need to set the piholeIP
 					# Saving it to a temporary file us to retrieve it later when we run the gravity.sh script
-					echo $IPv4addr > /tmp/piholeIP
+					echo ${IPv4addr%/*} > /tmp/piholeIP
 					# After that's done, the loop ends and we move on
 					ipSettingsCorrect=True
 				else
@@ -167,12 +163,6 @@ else
 				exit
 			fi
 		else
-			# Cancelling subnet mask settings window
-			ipSettingsCorrect=False
-			echo "User canceled."
-			exit
-		fi
-	else
 		# Cancelling IPv4 settings window
 		ipSettingsCorrect=False
 		echo "User canceled."
@@ -188,7 +178,7 @@ setStaticIPv4()
 {
 # Append these lines to /etc/dhcpcd.conf to enable a static IP
 echo "interface $piholeInterface
-static ip_address=$IPv4addr/24
+static ip_address=$IPv4addr
 static routers=$IPv4gw
 static domain_name_servers=$IPv4gw" | sudo tee -a $dhcpcdFile >/dev/null
 }
@@ -224,15 +214,15 @@ 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
-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/piholeLogFlush.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/piholeLogFlush.sh
-sudo chmod 755 /usr/local/bin/gravity.sh
-sudo chmod 755 /usr/local/bin/chronometer.sh
-sudo chmod 755 /usr/local/bin/whitelist.sh
-sudo chmod 755 /usr/local/bin/piholeLogFlush.sh
-sudo /usr/local/bin/gravity.sh
+sudo curl -o /usr/bin/gravity.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity.sh
+sudo curl -o /usr/bin/chronometer.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh
+sudo curl -o /usr/bin/whitelist.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/whitelist.sh
+sudo curl -o /usr/bin/piholeLogFlush.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/piholeLogFlush.sh
+sudo chmod 755 /usr/bin/gravity.sh
+sudo chmod 755 /usr/bin/chronometer.sh
+sudo chmod 755 /usr/bin/whitelist.sh
+sudo chmod 755 /usr/bin/piholeLogFlush.sh
+sudo /usr/bin/gravity.sh
 }
 
 ######## SCRIPT ############

From 6e13134328c779375b74b2a2f6d00ee39e67f578 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@ganymeade.com>
Date: Wed, 25 Nov 2015 13:51:11 -0800
Subject: [PATCH 18/29] Revert FHS change until merged

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

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 2609973f..f2a98fb7 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -214,15 +214,15 @@ 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
-sudo curl -o /usr/bin/gravity.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity.sh
-sudo curl -o /usr/bin/chronometer.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh
-sudo curl -o /usr/bin/whitelist.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/whitelist.sh
-sudo curl -o /usr/bin/piholeLogFlush.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/piholeLogFlush.sh
-sudo chmod 755 /usr/bin/gravity.sh
-sudo chmod 755 /usr/bin/chronometer.sh
-sudo chmod 755 /usr/bin/whitelist.sh
-sudo chmod 755 /usr/bin/piholeLogFlush.sh
-sudo /usr/bin/gravity.sh
+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/piholeLogFlush.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/piholeLogFlush.sh
+sudo chmod 755 /usr/local/bin/gravity.sh
+sudo chmod 755 /usr/local/bin/chronometer.sh
+sudo chmod 755 /usr/local/bin/whitelist.sh
+sudo chmod 755 /usr/local/bin/piholeLogFlush.sh
+sudo /usr/local/bin/gravity.sh
 }
 
 ######## SCRIPT ############

From 21ee63b7fb77da949eca5aca710afade971a0236 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@users.noreply.github.com>
Date: Wed, 25 Nov 2015 14:08:13 -0800
Subject: [PATCH 19/29] Get IP info from outgoing interface

Use IP to get interface information from outgoing interface. Use CIDR notation to make things easier.
---
 automated install/basic-install.sh | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index f0a7d139..f2a98fb7 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Pi-hole: A black hole for Internet advertisements
 # by Jacob Salmela
 # Network-wide ad blocking via your Raspberry Pi
@@ -24,9 +24,11 @@ columns=$(stty -a | tr \; \\012 | egrep 'columns' | cut -d' ' -f3)
 r=$(( rows / 2 ))
 c=$(( columns / 2 ))
 
-IPv4addr=$(ip -4 addr show | awk '{match($0,/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/); ip = substr($0,RSTART,RLENGTH); print ip}' | sed '/^\s*$/d' | grep -v "127.0.0.1")
-IPv4mask=$(ifconfig | awk -F':' '/inet addr/ && !/127.0.0.1/ {print $4}')
-IPv4gw=$(ip route show | awk '/default\ via/ {print $3}')
+# Find IP used to route to outside world
+IPv4info=$(ip route get 8.8.8.8)
+IPv4dev=$(echo $IPv4info| awk '{print $5}')
+IPv4addr=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}')
+IPv4gw=$(echo $IPv4info | awk '{print $3}')
 
 # IPv6 support to be added later
 #IPv6eui64=$(ip addr show | awk '/scope\ global/ && /ff:fe/ {print $2}' | cut -d'/' -f1)
@@ -117,7 +119,6 @@ getStaticIPv4Settings()
 if (whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Do you want to use your current network settings as a static address?
 
 								IP address:    $IPv4addr
-								Subnet mask:   $IPv4mask
 								Gateway:       $IPv4gw" $r $c) then
 	# If they choose yes, let the user know that the IP address will not be available via DHCP and may cause a conflict.
 	whiptail --msgbox --backtitle "IP information" --title "FYI: IP Conflict" "It is possible your router could still try to assign this IP to a device, which would cause a conflict.  But in most cases the router is smart enough to not do that.
@@ -138,22 +139,17 @@ else
 	IPv4addr=$(whiptail --backtitle "Calibrating network interface" --title "IPv4 address" --inputbox "Enter your desired IPv4 address" $r $c $IPv4addr 3>&1 1>&2 2>&3)
 	if [[ $? = 0 ]];then
     	echo "Your static IPv4 address:    $IPv4addr"
-		# Ask for the subnet mask
-		IPv4mask=$(whiptail --backtitle "Calibrating network interface" --title "IPv4 netmask" --inputbox "Enter your desired IPv4 subnet mask" $r $c $IPv4mask 3>&1 1>&2 2>&3)
-		if [[ $? = 0 ]];then
-			echo "Your static IPv4 netmask:    $IPv4mask"
-			# Ask for the gateway
+		# Ask for the gateway
 			IPv4gw=$(whiptail --backtitle "Calibrating network interface" --title "IPv4 gateway (router)" --inputbox "Enter your desired IPv4 default gateway" $r $c $IPv4gw 3>&1 1>&2 2>&3)
 			if [[ $? = 0 ]];then
 				echo "Your static IPv4 gateway:    $IPv4gw"
 				# Give the user a chance to review their settings before moving on
 				if (whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Are these settings correct?
 					IP address:    $IPv4addr
-					Subnet mask:   $IPv4mask
 					Gateway:       $IPv4gw" $r $c)then
 					# If the settings are correct, then we need to set the piholeIP
 					# Saving it to a temporary file us to retrieve it later when we run the gravity.sh script
-					echo $IPv4addr > /tmp/piholeIP
+					echo ${IPv4addr%/*} > /tmp/piholeIP
 					# After that's done, the loop ends and we move on
 					ipSettingsCorrect=True
 				else
@@ -167,12 +163,6 @@ else
 				exit
 			fi
 		else
-			# Cancelling subnet mask settings window
-			ipSettingsCorrect=False
-			echo "User canceled."
-			exit
-		fi
-	else
 		# Cancelling IPv4 settings window
 		ipSettingsCorrect=False
 		echo "User canceled."
@@ -188,7 +178,7 @@ setStaticIPv4()
 {
 # Append these lines to /etc/dhcpcd.conf to enable a static IP
 echo "interface $piholeInterface
-static ip_address=$IPv4addr/24
+static ip_address=$IPv4addr
 static routers=$IPv4gw
 static domain_name_servers=$IPv4gw" | sudo tee -a $dhcpcdFile >/dev/null
 }

From b011fe28d9ba095f6f6a057dc3a08bc0749f305b Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@ganymeade.com>
Date: Wed, 25 Nov 2015 14:34:06 -0800
Subject: [PATCH 20/29] No longer need a reboot

---
 automated install/basic-install.sh | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index f2a98fb7..47c402f6 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -128,8 +128,6 @@ if (whiptail --backtitle "Calibrating network interface" --title "Static IP Addr
 	It is also possible to use a DHCP reservation, but if you are going to do that, you might as well set a static address." $r $c
 	# Nothing else to do since the variables are already set above
 else
-	# Since a custom address will be used, restart at the end of the script to apply the new changes
-	rebootNeeded=true
 	# Otherwise, we need to ask the user to input their desired settings.
 	# Start by getting the IPv4 address (pre-filling it with info gathered from DHCP)
 	# Start a loop to let the user enter their information with the chance to go back and edit it if necessary
@@ -180,7 +178,8 @@ setStaticIPv4()
 echo "interface $piholeInterface
 static ip_address=$IPv4addr
 static routers=$IPv4gw
-static domain_name_servers=$IPv4gw" | sudo tee -a $dhcpcdFile >/dev/null
+static domain_name_servers=$IPv4gw" | sudo tee -a $dhcpcdFile >/dev/null 
+sudo ip addr replace dev $piholeInterface $IPv4addr
 }
 
 installPihole()
@@ -274,12 +273,5 @@ If you didn't use DHCP settings as your new static address, the Pi will restart
 
 The install log is in /etc/pihole." $r $c
 
-# If a custom address was set, restart
-if [[ "$rebootNeeded" = true ]];then
-	# Restart to apply the new static IP address
-	sudo reboot
-else
-	# If not, just start the services since the address will stay the same
-	sudo service dnsmasq start
-	sudo service lighttpd start
-fi
+sudo service dnsmasq start
+sudo service lighttpd start

From bc0a8e7733925799d0401c40fc1132a30ed516de Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Wed, 25 Nov 2015 18:08:17 -0600
Subject: [PATCH 21/29] final dialog verbiage

Updating dialog to reflect changes in #90
---
 automated install/basic-install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 47c402f6..3c6d14fd 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -178,7 +178,7 @@ setStaticIPv4()
 echo "interface $piholeInterface
 static ip_address=$IPv4addr
 static routers=$IPv4gw
-static domain_name_servers=$IPv4gw" | sudo tee -a $dhcpcdFile >/dev/null 
+static domain_name_servers=$IPv4gw" | sudo tee -a $dhcpcdFile >/dev/null
 sudo ip addr replace dev $piholeInterface $IPv4addr
 }
 
@@ -269,7 +269,7 @@ 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 didn't use DHCP settings as your new static address, the Pi will restart after this dialog.  If you are using SSH, you may need to reconnect using the IP address above.
+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
 

From 23856d65e21bb0b960882eecff48cdb932c586af Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@ganymeade.com>
Date: Wed, 25 Nov 2015 16:35:36 -0800
Subject: [PATCH 22/29] IP address detection update

---
 gravity.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gravity.sh b/gravity.sh
index c2d1ff92..49520549 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -8,7 +8,9 @@ if [[ -f $piholeIPfile ]];then
     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
-    piholeIP=$(ip -4 addr show | awk '{match($0,/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/); ip = substr($0,RSTART,RLENGTH); print ip}' | sed '/^\s*$/d' | grep -v "127.0.0.1" | (head -n1))
+	IPv4dev=$(ip route get 8.8.8.8 | awk '{print $5}')
+	piholeIPCIDR=$(ip -o -f inet addr show dev $IPv4dev | awk '{print $4}')
+	piholeIP=${piholeIPCIDR%/*}   
 fi
 
 # Ad-list sources--one per line in single quotes

From 29ae57465bbbf06606894278cda84ad8df08f15f Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@ganymeade.com>
Date: Wed, 25 Nov 2015 19:51:07 -0800
Subject: [PATCH 23/29] Bug Fix - Cleanup Files

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

diff --git a/gravity.sh b/gravity.sh
index ae20d439..d70f0dce 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -145,7 +145,7 @@ function gravity_Schwarzchild() {
 echo "** Aggregating list of domains..."
 truncate -s 0 $piholeDir/$matter
 for i in "${activeDomains[@]}"
-do
+do	
    cat $i |tr -d '\r' >> $piholeDir/$matter
 done
 
@@ -199,6 +199,16 @@ function gravity_hostFormat() {
         # Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
         cp $piholeDir/$accretionDisc $adList
 }
+function gravity_blackbody() {
+		for file in $piholeDir/*.$justDomainsExtension
+		do
+			if [[ " ${activeDomains[@]} " =~ " ${file} " ]]; then
+				:
+			else
+				rm -f $file
+			fi
+		done
+}
 function gravity_advanced() {
 
         # Remove comments and print only the domain name
@@ -221,4 +231,4 @@ gravity_Schwarzchild
 gravity_pulsar
 gravity_hostFormat
 gravity_advanced
-
+gravity_blackbody

From c45dc277b6117aae69e1e60cbe2d7e77ab2e4525 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@ganymeade.com>
Date: Thu, 26 Nov 2015 15:29:13 -0800
Subject: [PATCH 24/29] Tighten themeatics

---
 gravity.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index d70f0dce..018989c7 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -73,10 +73,10 @@ function gravity_patternCheck() {
                 # and stored as is. They can be processed for content after they
                 # have been saved.
                 cp $patternBuffer $saveLocation
-                echo "Done."
+                echo "List updated, transport successful..."
         else
                 # curl didn't download any host files, probably because of the date check
-                echo "Transporter logic detected no changes, pattern skipped..."
+                echo "No changes detected, transport skipped..."
         fi
 }
 
@@ -117,7 +117,7 @@ do
 
         agent="Mozilla/10.0"
 
-        echo -n "Getting $domain list... "
+        echo -n "  Getting $domain list: "
 
         # Use a case statement to download lists that need special cURL commands
         # to complete properly and reset the user agent when required

From d1e475da89154fe2ad83e03391137ca1fae0e99e Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@ganymeade.com>
Date: Thu, 26 Nov 2015 15:48:52 -0800
Subject: [PATCH 25/29] Move black/white list check to pulsar

---
 gravity.sh | 144 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 77 insertions(+), 67 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index 018989c7..27f5d823 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -4,6 +4,7 @@
 # Network-wide ad blocking via your Raspberry Pi
 # http://pi-hole.net
 # Compiles a list of ad-serving domains by downloading them from multiple sources
+
 piholeIPfile=/tmp/piholeIP
 if [[ -f $piholeIPfile ]];then
     # 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
@@ -15,7 +16,8 @@ else
 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
+# The mahakala source is commented out due to many users having issues with it blocking legitimate domains.
+# Uncomment at your own risk
 sources=('https://adaway.org/hosts.txt'
 'http://adblock.gjtech.net/?format=unix-hosts'
 #'http://adblock.mahakala.is/'
@@ -45,62 +47,65 @@ if [[ -r $piholeDir/pihole.conf ]];then
     echo "** Local calibration requested..."
         . $piholeDir/pihole.conf
 fi
+
 ###########################
 # collapse - begin formation of pihole
 function gravity_collapse() {
 echo "** Neutrino emissions detected..."
 
-# Create the pihole resource directory if it doesn't exist.  Future files will be stored here
-if [[ -d $piholeDir ]];then
+	# Create the pihole resource directory if it doesn't exist.  Future files will be stored here
+	if [[ -d $piholeDir ]];then
         # Temporary hack to allow non-root access to pihole directory
         # Will update later, needed for existing installs, new installs should
         # create this directory as non-root
         sudo chmod 777 $piholeDir
         find "$piholeDir" -type f -exec sudo chmod 666 {} \;
-else
+	else
         echo "** Creating pihole directory..."
         mkdir $piholeDir
-fi
+	fi
 }
 
 # patternCheck - check to see if curl downloaded any new files, and then process those
 # files so they are in host format.
 function gravity_patternCheck() {
-        patternBuffer=$1
-        # check if the patternbuffer is a non-zero length file
-        if [[ -s "$patternBuffer" ]];then
-                # Some of the blocklists are copyright, they need to be downloaded
-                # and stored as is. They can be processed for content after they
-                # have been saved.
-                cp $patternBuffer $saveLocation
-                echo "List updated, transport successful..."
-        else
-                # curl didn't download any host files, probably because of the date check
-                echo "No changes detected, transport skipped..."
-        fi
+	patternBuffer=$1
+	# check if the patternbuffer is a non-zero length file
+	if [[ -s "$patternBuffer" ]];then
+		# Some of the blocklists are copyright, they need to be downloaded
+		# and stored as is. They can be processed for content after they
+		# have been saved.
+		cp $patternBuffer $saveLocation
+		echo "List updated, transport successful..."
+	else
+		# curl didn't download any host files, probably because of the date check
+		echo "No changes detected, transport skipped..."
+	fi
 }
 
 # transport - curl the specified url with any needed command extentions, then patternCheck
 function gravity_transport() {
-        url=$1
-        cmd_ext=$2
-        agent=$3
-        # tmp file, so we don't have to store the (long!) lists in RAM
-        patternBuffer=$(mktemp)
-        heisenbergCompensator=""
-        if [[ -r $saveLocation ]]; then
-                # if domain has been saved, add file for date check to only download newer
-                heisenbergCompensator="-z $saveLocation"
-        fi
-        # Silently curl url
-        curl -s $cmd_ext $heisenbergCompensator -A "$agent" $url > $patternBuffer
+	url=$1
+	cmd_ext=$2
+	agent=$3
+	
+	# tmp file, so we don't have to store the (long!) lists in RAM
+	patternBuffer=$(mktemp)
+	heisenbergCompensator=""
+	if [[ -r $saveLocation ]]; then
+		# if domain has been saved, add file for date check to only download newer
+		heisenbergCompensator="-z $saveLocation"
+	fi
 
-        gravity_patternCheck $patternBuffer
-
-        # Cleanup
-        rm -f $patternBuffer
+	# Silently curl url
+	curl -s $cmd_ext $heisenbergCompensator -A "$agent" $url > $patternBuffer
+	# Check for list updates
+	gravity_patternCheck $patternBuffer
 
+	# Cleanup
+	rm -f $patternBuffer
 }
+
 # spinup - main gravity function
 function gravity_spinup() {
 
@@ -141,26 +146,26 @@ done
 # Schwarzchild - aggregate domains to one list and add blacklisted domains
 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
-for i in "${activeDomains[@]}"
-do	
-   cat $i |tr -d '\r' >> $piholeDir/$matter
-done
-
-# 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
-fi
+	# Find all active domains and compile them into one file and remove CRs
+	echo "** Aggregating list of domains..."
+	truncate -s 0 $piholeDir/$matter
+	for i in "${activeDomains[@]}"
+	do	
+   		cat $i |tr -d '\r' >> $piholeDir/$matter
+	done
 }
 
 function gravity_pulsar() {
+	
+	# 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
+	fi
 
-# Whitelist (if applicable) domains
-if [[ -r $whitelist ]];then
+	# Whitelist (if applicable) domains
+	if [[ -r $whitelist ]];then
         # Remove whitelist entries
         numberOf=$(cat $whitelist | sed '/^\s*$/d' | wc -l)
         plural=; [[ "$numberOf" != "1" ]] && plural=s
@@ -170,20 +175,20 @@ if [[ -r $whitelist ]];then
         # 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
+	else
         rm $latentWhitelist
-fi
+	fi
 
-# Prevent our sources from being pulled into the hole
-plural=; [[ "${#sources[@]}" != "1" ]] && plural=s
-echo "** Whitelisting ${#sources[@]} ad list source${plural}..."
-for url in ${sources[@]}
-do
+	# Prevent our sources from being pulled into the hole
+	plural=; [[ "${#sources[@]}" != "1" ]] && plural=s	
+	echo "** Whitelisting ${#sources[@]} ad list source${plural}..."
+	for url in ${sources[@]}
+	do
         echo "$url" | awk -F '/' '{print "^"$3"$"}' | sed 's/\./\\./g' >> $latentWhitelist
-done
+	done
 
-# Remove whitelist entries from list
-grep -vxf $latentWhitelist $piholeDir/$matter > $piholeDir/$andLight
+	# Remove whitelist entries from list
+	grep -vxf $latentWhitelist $piholeDir/$matter > $piholeDir/$andLight
 }
 
 function gravity_unique() {
@@ -192,6 +197,7 @@ function gravity_unique() {
         numberOf=$(wc -l < $piholeDir/$eventHorizon)
         echo "** $numberOf unique domains trapped in the event horizon."
 }
+
 function gravity_hostFormat() {
         # Format domain list as "192.168.x.x domain.com"
         echo "** Formatting domains into a HOSTS file..."
@@ -199,16 +205,20 @@ function gravity_hostFormat() {
         # Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
         cp $piholeDir/$accretionDisc $adList
 }
+
 function gravity_blackbody() {
-		for file in $piholeDir/*.$justDomainsExtension
-		do
-			if [[ " ${activeDomains[@]} " =~ " ${file} " ]]; then
-				:
-			else
-				rm -f $file
-			fi
-		done
+	# Loop through list files	
+	for file in $piholeDir/*.$justDomainsExtension
+	do
+		# If list is active then leave it (noop) else rm the list
+		if [[ " ${activeDomains[@]} " =~ " ${file} " ]]; then
+			:
+		else
+			rm -f $file
+		fi
+	done
 }
+
 function gravity_advanced() {
 
         # Remove comments and print only the domain name

From 9892d06c0db96ad090061778049e765d05283007 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@ganymeade.com>
Date: Thu, 26 Nov 2015 15:56:37 -0800
Subject: [PATCH 26/29] Code format cleanups

---
 gravity.sh | 61 +++++++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/gravity.sh b/gravity.sh
index 27f5d823..f34ce80b 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -51,7 +51,7 @@ fi
 ###########################
 # collapse - begin formation of pihole
 function gravity_collapse() {
-echo "** Neutrino emissions detected..."
+	echo "** Neutrino emissions detected..."
 
 	# Create the pihole resource directory if it doesn't exist.  Future files will be stored here
 	if [[ -d $piholeDir ]];then
@@ -66,8 +66,7 @@ echo "** Neutrino emissions detected..."
 	fi
 }
 
-# patternCheck - check to see if curl downloaded any new files, and then process those
-# files so they are in host format.
+# patternCheck - check to see if curl downloaded any new files.
 function gravity_patternCheck() {
 	patternBuffer=$1
 	# check if the patternbuffer is a non-zero length file
@@ -83,7 +82,7 @@ function gravity_patternCheck() {
 	fi
 }
 
-# transport - curl the specified url with any needed command extentions, then patternCheck
+# transport - curl the specified url with any needed command extentions
 function gravity_transport() {
 	url=$1
 	cmd_ext=$2
@@ -109,9 +108,9 @@ function gravity_transport() {
 # spinup - main gravity function
 function gravity_spinup() {
 
-# Loop through domain list.  Download each one and remove commented lines (lines beginning with '# 'or '/') and blank lines
-for ((i = 0; i < "${#sources[@]}"; i++))
-do
+	# Loop through domain list.  Download each one and remove commented lines (lines beginning with '# 'or '/') and	 		# blank lines
+	for ((i = 0; i < "${#sources[@]}"; i++))
+	do
         url=${sources[$i]}
         # Get just the domain from the URL
         domain=$(echo "$url" | cut -d'/' -f3)
@@ -139,8 +138,8 @@ do
                 # Default is a simple request
                 *) cmd_ext=""
         esac
-        gravity_transport $url $cmd_ext $agent
-done
+        gravity_transport $url $cmd_ext $agent	
+	done
 }
 
 # Schwarzchild - aggregate domains to one list and add blacklisted domains
@@ -155,6 +154,7 @@ function gravity_Schwarzchild() {
 	done
 }
 
+# Pulsar - White/blacklist application
 function gravity_pulsar() {
 	
 	# Append blacklist entries if they exist
@@ -192,25 +192,26 @@ function gravity_pulsar() {
 }
 
 function gravity_unique() {
-        # Sort and remove duplicates
-        sort -u  $piholeDir/$supernova > $piholeDir/$eventHorizon
-        numberOf=$(wc -l < $piholeDir/$eventHorizon)
-        echo "** $numberOf unique domains trapped in the event horizon."
+	# Sort and remove duplicates
+	sort -u  $piholeDir/$supernova > $piholeDir/$eventHorizon
+	numberOf=$(wc -l < $piholeDir/$eventHorizon)
+	echo "** $numberOf unique domains trapped in the event horizon."
 }
 
 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
-        # Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
-        cp $piholeDir/$accretionDisc $adList
+	# 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
+	# Copy the file over as /etc/pihole/gravity.list so dnsmasq can use it
+	cp $piholeDir/$accretionDisc $adList
 }
 
+# blackbody - remove any remnant files from script processes
 function gravity_blackbody() {
 	# Loop through list files	
 	for file in $piholeDir/*.$justDomainsExtension
 	do
-		# If list is active then leave it (noop) else rm the list
+		# If list is in active array then leave it (noop) else rm the list
 		if [[ " ${activeDomains[@]} " =~ " ${file} " ]]; then
 			:
 		else
@@ -220,19 +221,19 @@ 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
 
-        # 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
+	numberOf=$(wc -l < $piholeDir/$supernova)
+	echo "** $numberOf domains being pulled in by gravity..."
 
-        numberOf=$(wc -l < $piholeDir/$supernova)
-        echo "** $numberOf domains being pulled in by gravity..."
-        gravity_unique
-
-        sudo kill -HUP $(pidof dnsmasq)
+	gravity_unique
+	
+	sudo kill -HUP $(pidof dnsmasq)
 }
 
 gravity_collapse

From a2cddda590ad983dc7ae8915646130559eb1e947 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Fri, 27 Nov 2015 18:29:44 -0600
Subject: [PATCH 27/29] if whitelist.txt doesn't exist, create it

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

diff --git a/advanced/Scripts/whitelist.sh b/advanced/Scripts/whitelist.sh
index d610d0a5..97385c97 100755
--- a/advanced/Scripts/whitelist.sh
+++ b/advanced/Scripts/whitelist.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+if [[ ! -f /etc/pihole/whitelist.txt ]];then
+    touch /etc/pihole/whitelist.txt
+fi
+
 if [ $# = 0 ]; then
     echo "Immediately whitelists one or more domains."
     echo "Usage: whitelist.sh domain1 [domain2 ...]"
@@ -29,7 +33,7 @@ done
 # Now report on and remove matched domains
 if [ "$combopattern" != "" ]; then
   echo "Modifying hosts file..."
-  
+
   # 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")$"}')

From 573c1ef94f1baa0da7ec53dd9221ddf7c03957bc Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Fri, 27 Nov 2015 18:34:02 -0600
Subject: [PATCH 28/29] double bracket notation

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

diff --git a/advanced/Scripts/whitelist.sh b/advanced/Scripts/whitelist.sh
index 97385c97..ea06cc8b 100755
--- a/advanced/Scripts/whitelist.sh
+++ b/advanced/Scripts/whitelist.sh
@@ -4,7 +4,7 @@ if [[ ! -f /etc/pihole/whitelist.txt ]];then
     touch /etc/pihole/whitelist.txt
 fi
 
-if [ $# = 0 ]; then
+if [[ $# = 0 ]]; then
     echo "Immediately whitelists one or more domains."
     echo "Usage: whitelist.sh domain1 [domain2 ...]"
 fi
@@ -19,9 +19,9 @@ do
   # Construct basic pattern to match domain name.
   basicpattern=$(echo $var | awk -F '[# \t]' 'NF>0&&$1!="" {print ""$1""}' | sed 's/\./\\./g')
 
-  if [ "$basicpattern" != "" ]; then
+  if [[ "$basicpattern" != "" ]]; then
     # Add to the combination pattern that will be used below
-    if [ "$combopattern" != "" ]; then combopattern="$combopattern|"; fi
+    if [[ "$combopattern" != "" ]]; then combopattern="$combopattern|"; fi
     combopattern="$combopattern$basicpattern"
 
     # Also add the domain to the whitelist but only if it's not already present
@@ -31,7 +31,7 @@ do
 done
 
 # Now report on and remove matched domains
-if [ "$combopattern" != "" ]; then
+if [[ "$combopattern" != "" ]]; then
   echo "Modifying hosts file..."
 
   # Construct pattern to match entry in hosts file.

From 831322b8b2d6faa07b3951cd1973dab4d6ebaf62 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Fri, 27 Nov 2015 18:38:33 -0600
Subject: [PATCH 29/29] replace file paths with variables

---
 advanced/Scripts/whitelist.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/advanced/Scripts/whitelist.sh b/advanced/Scripts/whitelist.sh
index ea06cc8b..cda557c0 100755
--- a/advanced/Scripts/whitelist.sh
+++ b/advanced/Scripts/whitelist.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
-
-if [[ ! -f /etc/pihole/whitelist.txt ]];then
-    touch /etc/pihole/whitelist.txt
+whitelist=/etc/pihole/whitelist.txt
+adList=/etc/pihole/gravity.list
+if [[ ! -f $whitelist ]];then
+    touch $whitelist
 fi
 
 if [[ $# = 0 ]]; then
@@ -25,8 +26,8 @@ do
     combopattern="$combopattern$basicpattern"
 
     # Also add the domain to the whitelist but only if it's not already present
-    grep -E -q "^$basicpattern$" /etc/pihole/whitelist.txt \
-    || echo "$var" >> /etc/pihole/whitelist.txt
+    grep -E -q "^$basicpattern$" $whitelist \
+    || echo "$var" >> $whitelist
   fi
 done
 
@@ -39,8 +40,8 @@ if [[ "$combopattern" != "" ]]; then
   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' /etc/pihole/gravity.list
-  sed -r -i '/'"$pattern"'/d' /etc/pihole/gravity.list
+  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