Merge pull request #244 from pi-hole/development

Code update for 2016/01/25.

README.md

@@ -17,6 +17,7 @@ Once installed, [configure your router to have **DHCP clients use the Pi as thei
 [![Pi-hole exlplained](http://i.imgur.com/qNybJDX.png)](https://vimeo.com/135965232)
 
 ## Pi-hole Projects
+- [Pi-hole Chrome extension](https://chrome.google.com/webstore/detail/pi-hole-list-editor/hlnoeoejkllgkjbnnnhfolapllcnaglh) ([open source](https://github.com/packtloss/pihole-extension))
 - [Go Bananas for CHiP-hole ad blocking](https://www.hackster.io/jacobsalmela/chip-hole-network-wide-ad-blocker-98e037)
 - [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/)
@@ -46,10 +47,10 @@ The Pi-hole is an **advertising-aware DNS/Web server**.  If an ad domain is quer
 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) (if you decide to use the [mahakala list](https://github.com/jacobsalmela/pi-hole/commit/963eacfe0537a7abddf30441c754c67ca1e40965)).
+The [gravity.sh](https://github.com/pi-hole/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/pi-hole/pi-hole/commit/963eacfe0537a7abddf30441c754c67ca1e40965)).
 
 ## Whitelist and blacklist
-Domains can be whitelisted and blacklisted using two pre-installed scripts. See [the wiki page](https://github.com/jacobsalmela/pi-hole/wiki/Whitelisting-and-Blacklisting) for more details
+Domains can be whitelisted and blacklisted using two pre-installed scripts. See [the wiki page](https://github.com/pi-hole/pi-hole/wiki/Whitelisting-and-Blacklisting) for more details
 
 ## 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:
@@ -73,11 +74,11 @@ The same output can be acheived on the CLI by running `chronometer.sh -j`
 
 ## 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).
+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/pi-hole/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
+- See the [Wiki](https://github.com/pi-hole/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

advanced/Scripts/blacklist.sh

@@ -81,13 +81,14 @@ function AddDomain(){
 	if $bool; then
 	  #domain not found in the blacklist file, add it!
 	  if $versbose; then
-	  echo "** Adding $1 to blacklist file"
+	  echo -n "::: Adding $1 to blacklist file..."
 	  fi
 		echo $1 >> $blacklist
 		modifyHost=true
+		echo " done!"
 	else
 	if $versbose; then
-		echo "** $1 already blacklisted! No need to add"
+		echo "::: $1 already exists in blacklist.txt! No need to add"
 		fi
 	fi
 }
@@ -99,12 +100,12 @@ function RemoveDomain(){
   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"
+  	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..."
+    echo "::: Un-blacklisting $dom..."
     fi
     domToRemoveList=("${domToRemoveList[@]}" $1)    
     modifyHost=true	  	
@@ -117,7 +118,8 @@ function ModifyHostFile(){
 	    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}..."	   		    
+        echo ":::"
+        echo -n "::: Modifying HOSTS file to blacklist $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	        
@@ -127,11 +129,17 @@ function ModifyHostFile(){
 	  	fi
 	  else
 		
+		echo ":::"
 	  for dom in "${domToRemoveList[@]}"
 		do	  
 	      #we need to remove the domains from the blacklist file and the host file	     
+				echo "::: $dom"
+				echo -n ":::    removing from HOSTS file..."
 	      echo $dom | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /[^.]'{}'(?!.)/;' $adList  
+	      echo " done!"
+	      echo -n ":::    removing from blackist.txt..."
 	      echo $dom | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /'{}'(?!.)/;' $blacklist
+	      echo " done!"
 		done	  
 		fi
 	  
@@ -139,7 +147,8 @@ function ModifyHostFile(){
 
 function Reload() {
 	# Reload hosts file
-	echo "** Refresh lists in dnsmasq..."
+	echo ":::"
+	echo -n "::: Refresh lists in dnsmasq..."
 
 	dnsmasqPid=$(pidof dnsmasq)
 
@@ -150,6 +159,7 @@ function Reload() {
 		# service not running, start it up
 		sudo service dnsmasq start
 	fi
+	echo " done!"
 }
 
 ###################################################
@@ -168,11 +178,10 @@ done
 PopBlacklistFile
 
 if $modifyHost || $force; then	
-	echo "** Modifying Hosts File"
 	ModifyHostFile
 else
   if $versbose; then
-	echo "** No changes need to be made"
+	echo "::: No changes need to be made"
 	fi
 	exit 1
 fi

advanced/Scripts/updateDashboard.sh

@@ -11,7 +11,7 @@
 # @TODO: add git as requirement to basic-install.sh
 #
 
-WEB_INTERFACE_GIT_URL="https://github.com/jacobsalmela/AdminLTE.git"
+WEB_INTERFACE_GIT_URL="https://github.com/pi-hole/AdminLTE.git"
 WEB_INTERFACE_DIR="/var/www/html/admin"
 
 main() {

advanced/Scripts/whitelist.sh

@@ -52,7 +52,7 @@ function HandleOther(){
 	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
+		echo "::: $1 is not a valid argument or domain name"
 	else	  
 	  domList=("${domList[@]}" $validDomain)
 	fi
@@ -76,17 +76,21 @@ function PopWhitelistFile(){
 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!
 	  if $versbose; then
-	  echo "** Adding $1 to whitelist file"
+		echo -n "::: Adding $1 to whitelist.txt..."
 	  fi
-		echo $1 >> $whitelist
+	  echo $1 >> $whitelist
 		modifyHost=true
+		if $versbose; then
+	  	echo " done!"
+	  fi
 	else
 		if $versbose; then
-			echo "** $1 already whitelisted! No need to add"
+			echo "::: $1 already exists in whitelist.txt, no need to add!"
 		fi
 	fi
 }
@@ -98,13 +102,13 @@ function RemoveDomain(){
   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"
+  	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
+    #if $versbose; then
-    echo "** Un-whitelisting $dom..."
+    #echo "::: Un-whitelisting $dom..."
-    fi
+    #fi
     domToRemoveList=("${domToRemoveList[@]}" $1)
     modifyHost=true	  	
   fi  	
@@ -115,30 +119,46 @@ function ModifyHostFile(){
 	    #remove domains in  from hosts file
 	    if [[ -r $whitelist ]];then
         # Remove whitelist entries
-        numberOf=$(cat $whitelist | sed '/^\s*$/d' | wc -l)
+				numberOf=$(cat $whitelist | sed '/^\s*$/d' | wc -l)
         plural=; [[ "$numberOf" != "1" ]] && plural=s
-        echo "** Whitelisting a total of $numberOf domain${plural}..."	   
+        echo ":::"
-	  	  awk -F':' '{ print $1 }' $whitelist | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /[^.]'{}'(?!.)/;' $adList
+        echo -n "::: Modifying HOSTS file to whitelist $numberOf domain${plural}..."
+        awk -F':' '{print $1}' $whitelist | while read line; do echo "$piholeIP $line"; done > /etc/pihole/whitelist.tmp
+        awk -F':' '{print $1}' $whitelist | while read line; do echo "$piholeIPv6 $line"; done >> /etc/pihole/whitelist.tmp
+        echo "l" >> /etc/pihole/whitelist.tmp
+        grep -F -x -v -f /etc/pihole/whitelist.tmp /etc/pihole/gravity.list > /etc/pihole/gravity.tmp        
+        rm /etc/pihole/gravity.list
+        mv /etc/pihole/gravity.tmp /etc/pihole/gravity.list
+        rm /etc/pihole/whitelist.tmp
+        echo " done!"
+	  	  
 	  	fi
 	  else
 	    #we need to add the removed domains to the hosts file
+	    echo ":::"
+	    echo "::: Modifying HOSTS file to un-whitelist domains..."
 	    for rdom in "${domToRemoveList[@]}"
 	    do	      
 	    	if [[ -n $piholeIPv6 ]];then
-	    	  echo "**Blacklisting $rdom on IPv4 and IPv6"
+	    	  echo -n ":::    Un-whitelisting $rdom on IPv4 and IPv6..."
 	    	  echo $rdom | awk -v ipv4addr="$piholeIP" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> $adList
+	    	  echo " done!"
 	      else
-	        echo "**Blacklisting $rdom on IPv4"
+	        echo -n ":::    Un-whitelisting $rdom on IPv4"
 	      	echo $rdom | awk -v ipv4addr="$piholeIP" '{sub(/\r$/,""); print ipv4addr" "$0}' >>$adList
+	      	echo " done!"
 	      fi
+	      echo -n ":::        Removing $rdom from whitelist.txt..."
 	      echo $rdom| sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /'{}'(?!.)/;' $whitelist
+	      echo " done!"
 	    done
 	  fi	
 }
 
 function Reload() {
 	# Reload hosts file
-	echo "** Refresh lists in dnsmasq..."
+	echo ":::"
+	echo -n "::: Refresh lists in dnsmasq..."
 	dnsmasqPid=$(pidof dnsmasq)
 
 	if [[ $dnsmasqPid ]]; then
@@ -148,6 +168,7 @@ function Reload() {
 		# service not running, start it up
 		sudo service dnsmasq start
 	fi
+	echo " done!"
 }
 
 ###################################################
@@ -166,11 +187,11 @@ done
 PopWhitelistFile
 
 if $modifyHost || $force; then
-	echo "** Modifying Hosts File"
+	 ModifyHostFile
-	ModifyHostFile
 else
   if $versbose; then
-	echo "** No changes need to be made"
+  echo ":::"
+	echo "::: No changes need to be made"
 	exit 1
 	fi
 fi

automated install/basic-install.sh

@@ -17,25 +17,15 @@
 # curl -L install.pi-hole.net | bash
 
 ######## VARIABLES #########
-# Must be root to install
-if [[ $EUID -eq 0 ]];then
-	echo "You are root."
-else
-	echo "::: sudo will be used for the install."
-  # Check if it is actually installed
-  # If it isn't, exit because the install cannot complete
-  if [[ $(dpkg-query -s sudo) ]];then
-		export SUDO="sudo"
-  else
-		echo "::: Please install sudo or run this as root."
-    exit 1
-  fi
-fi
-
-
 tmpLog=/tmp/pihole-install.log
 instalLogLoc=/etc/pihole/install.log
 
+webInterfaceGitUrl="https://github.com/pi-hole/AdminLTE.git"
+webInterfaceDir="/var/www/html/admin"
+piholeGitUrl="https://github.com/pi-hole/pi-hole.git"
+piholeFilesDir="/etc/.pihole"
+
+
 # Find the rows and columns
 rows=$(tput lines)
 columns=$(tput cols)
@@ -52,345 +42,433 @@ IPv4gw=$(ip route get 8.8.8.8 | awk '{print $3}')
 availableInterfaces=$(ip -o link | awk '{print $2}' | grep -v "lo" | cut -d':' -f1)
 dhcpcdFile=/etc/dhcpcd.conf
 
-####### FUCNTIONS ##########
+######## FIRST CHECK ########
-###All creddit for the below function goes to http://fitnr.com/showing-a-bash-spinner.html
+# Must be root to install
-spinner()
+echo ":::"
-{
+if [[ $EUID -eq 0 ]];then
-    local pid=$1
+	echo "::: You are root."
-    local delay=0.001
-    local spinstr='|/-\'
-    while [ "$(ps a | awk '{print $1}' | grep $pid)" ]; do
-        local temp=${spinstr#?}
-        printf " [%c]  " "$spinstr"
-        local spinstr=$temp${spinstr%"$temp"}
-        sleep $delay
-        printf "\b\b\b\b\b\b"
-    done
-    printf "    \b\b\b\b"
-}
-
-
-backupLegacyPihole()
-{
-if [[ -f /etc/dnsmasq.d/adList.conf ]];then
-	echo "Original Pi-hole detected.  Initiating sub space transport"
-	$SUDO mkdir -p /etc/pihole/original/
-	$SUDO mv /etc/dnsmasq.d/adList.conf /etc/pihole/original/adList.conf.$(date "+%Y-%m-%d")
-	$SUDO mv /etc/dnsmasq.conf /etc/pihole/original/dnsmasq.conf.$(date "+%Y-%m-%d")
-	$SUDO mv /etc/resolv.conf /etc/pihole/original/resolv.conf.$(date "+%Y-%m-%d")
-	$SUDO mv /etc/lighttpd/lighttpd.conf /etc/pihole/original/lighttpd.conf.$(date "+%Y-%m-%d")
-	$SUDO mv /var/www/pihole/index.html /etc/pihole/original/index.html.$(date "+%Y-%m-%d")
-	$SUDO mv /usr/local/bin/gravity.sh /etc/pihole/original/gravity.sh.$(date "+%Y-%m-%d")
 else
-	:
+	echo "::: sudo will be used for the install."
+	# Check if it is actually installed
+	# If it isn't, exit because the install cannot complete
+	if [[ $(dpkg-query -s sudo) ]];then
+		export SUDO="sudo"
+	else
+		echo "::: Please install sudo or run this as root."
+		exit 1
+	fi
 fi
+
+if [ -f "/etc/dnsmasq.d/01-pihole.conf" ]; then
+		#Likely an existing install
+		upgrade=true
+	else
+	  upgrade=false
+fi
+
+####### FUNCTIONS ##########
+###All credit for the below function goes to http://fitnr.com/showing-a-bash-spinner.html
+spinner(){
+        local pid=$1
+
+        spin='-\|/'
+        i=0
+        while $SUDO kill -0 $pid 2>/dev/null
+        do
+                i=$(( (i+1) %4 ))
+                printf "\b${spin:$i:1}"
+                sleep .1
+        done
+        printf "\b"
 }
 
-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.
 
-In the next section, you can choose to use your current network settings (DHCP) or to manually edit them." $r $c
+backupLegacyPihole(){
+	if [[ -f /etc/dnsmasq.d/adList.conf ]];then
+		echo "Original Pi-hole detected.  Initiating sub space transport"
+		$SUDO mkdir -p /etc/pihole/original/
+		$SUDO mv /etc/dnsmasq.d/adList.conf /etc/pihole/original/adList.conf.$(date "+%Y-%m-%d")
+		$SUDO mv /etc/dnsmasq.conf /etc/pihole/original/dnsmasq.conf.$(date "+%Y-%m-%d")
+		$SUDO mv /etc/resolv.conf /etc/pihole/original/resolv.conf.$(date "+%Y-%m-%d")
+		$SUDO mv /etc/lighttpd/lighttpd.conf /etc/pihole/original/lighttpd.conf.$(date "+%Y-%m-%d")
+		$SUDO mv /var/www/pihole/index.html /etc/pihole/original/index.html.$(date "+%Y-%m-%d")
+		$SUDO mv /usr/local/bin/gravity.sh /etc/pihole/original/gravity.sh.$(date "+%Y-%m-%d")
+	else
+		:
+	fi
 }
 
-chooseInterface()
+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.	
+	In the next section, you can choose to use your current network settings (DHCP) or to manually edit them." $r $c
+}
+
+chooseInterface(){
 # Turn the available interfaces into an array so it can be used with a whiptail dialog
-interfacesArray=()
+	interfacesArray=()
-firstloop=1
+	firstloop=1
 	
-while read -r line
+	while read -r line
-do
-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
-interfaceCount=$(echo "$availableInterfaces" | wc -l)
-chooseInterfaceCmd=(whiptail --separate-output --radiolist "Choose An Interface" $r $c $interfaceCount)
-chooseInterfaceOptions=$("${chooseInterfaceCmd[@]}" "${interfacesArray[@]}" 2>&1 >/dev/tty)
-for desiredInterface in $chooseInterfaceOptions
-do
-	piholeInterface=$desiredInterface
-	echo "::: Using interface: $piholeInterface"
-	echo ${piholeInterface} > /tmp/piholeINT
-done
-}
-
-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 IPv6" off)
-choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
-for choice in $choices
-do
-    case $choice in
-        IPv4)useIPv4=true;;
-        IPv6)useIPv6=true;;
-    esac
-done    
-    if [ $useIPv4 ] && [ ! $useIPv6 ]; then
-     	getStaticIPv4Settings
-			setStaticIPv4	
-			echo "::: Using IPv4 on $IPv4addr" 
-			echo "::: IPv6 will NOT be used."			
-    fi
-    if [ ! $useIPv4 ] && [ $useIPv6 ]; then
-    	useIPv6dialog
-    	echo "::: IPv4 will NOT be used."
-    	echo "::: Using IPv6 on $piholeIPv6"
-    fi
-    if [ $useIPv4 ] && [  $useIPv6 ]; then    	
-    	getStaticIPv4Settings
-			setStaticIPv4
-			useIPv6dialog	
-			echo "::: Using IPv4 on $IPv4addr"
-    	echo "::: Using IPv6 on $piholeIPv6"
-    fi
-    if [ ! $useIPv4 ] && [ ! $useIPv6 ]; then
-    	echo "::: Cannot continue, neither IPv4 or IPv6 selected"
-    	echo "::: Exiting"
-    	exit 1
-    fi
-	
-}
-
-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 "IPv6 Supported" "$piholeIPv6 will be used to block ads." $r $c
-$SUDO mkdir -p /etc/pihole/
-$SUDO touch /etc/pihole/.useIPv6
-}
-
-getStaticIPv4Settings()
-{
-# Ask if the user wannts to use DHCP settings as their static IP
-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
-								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.
-
-	If you are worried, either manually set the address, or modify the DHCP reservation pool so it does not include the IP you want.
-
-	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
-	# 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
-	until [[ $ipSettingsCorrect = True ]]
 	do
-	# Ask for the IPv4 address
+		mode="OFF"
-	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 [[ $firstloop -eq 1 ]]; then
-	if [[ $? = 0 ]];then
+			firstloop=0
-    	echo "Your static IPv4 address:    $IPv4addr"
+			mode="ON"
-		# Ask for the gateway
+		fi
-			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)
+		interfacesArray+=("$line" "available" "$mode")
+	done <<< "$availableInterfaces"
+	
+	# Find out how many interfaces are available to choose from
+	interfaceCount=$(echo "$availableInterfaces" | wc -l)
+	chooseInterfaceCmd=(whiptail --separate-output --radiolist "Choose An Interface" $r $c $interfaceCount)
+	chooseInterfaceOptions=$("${chooseInterfaceCmd[@]}" "${interfacesArray[@]}" 2>&1 >/dev/tty)
+	
+	for desiredInterface in $chooseInterfaceOptions
+	do
+		piholeInterface=$desiredInterface
+		echo "::: Using interface: $piholeInterface"
+		echo ${piholeInterface} > /tmp/piholeINT
+	done
+}
+
+
+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 IPv6" off)
+	choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
+	for choice in $choices
+	do
+		case $choice in
+		IPv4	)		useIPv4=true;;
+		IPv6	)		useIPv6=true;;
+		esac
+	done
+	if [ $useIPv4 ] && [ ! $useIPv6 ]; then
+		getStaticIPv4Settings
+		setStaticIPv4
+		echo "::: Using IPv4 on $IPv4addr"
+		echo "::: IPv6 will NOT be used."
+	fi
+	if [ ! $useIPv4 ] && [ $useIPv6 ]; then
+		useIPv6dialog
+		echo "::: IPv4 will NOT be used."
+		echo "::: Using IPv6 on $piholeIPv6"
+	fi
+	if [ $useIPv4 ] && [  $useIPv6 ]; then
+		getStaticIPv4Settings
+		setStaticIPv4
+		useIPv6dialog
+		echo "::: Using IPv4 on $IPv4addr"
+		echo "::: Using IPv6 on $piholeIPv6"
+	fi
+	if [ ! $useIPv4 ] && [ ! $useIPv6 ]; then
+		echo "::: Cannot continue, neither IPv4 or IPv6 selected"
+		echo "::: Exiting"
+		exit 1
+	fi
+}
+
+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 "IPv6 Supported" "$piholeIPv6 will be used to block ads." $r $c
+	$SUDO mkdir -p /etc/pihole/
+	$SUDO touch /etc/pihole/.useIPv6
+}
+
+getStaticIPv4Settings(){
+	# Ask if the user wants to use DHCP settings as their static IP
+	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
+									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.
+		If you are worried, either manually set the address, or modify the DHCP reservation pool so it does not include the IP you want.
+		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
+		# 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
+		until [[ $ipSettingsCorrect = True ]]
+		do
+			# Ask for the IPv4 address
+			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 gateway:    $IPv4gw"
+				echo "Your static IPv4 address:    $IPv4addr"
-				# Give the user a chance to review their settings before moving on
+				# Ask for the gateway
-				if (whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Are these settings correct?
+				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)
-					IP address:    $IPv4addr
+				if [[ $? = 0 ]];then
-					Gateway:       $IPv4gw" $r $c)then
+					echo "Your static IPv4 gateway:    $IPv4gw"
-					# If the settings are correct, then we need to set the piholeIP
+					# Give the user a chance to review their settings before moving on
-					# Saving it to a temporary file us to retrieve it later when we run the gravity.sh script
+					if (whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Are these settings correct?
-					echo ${IPv4addr%/*} > /tmp/piholeIP
+							IP address:    $IPv4addr
-					echo $piholeInterface > /tmp/piholeINT
+							Gateway:       $IPv4gw" $r $c)then
-					# After that's done, the loop ends and we move on
+							# If the settings are correct, then we need to set the piholeIP
-					ipSettingsCorrect=True
+							# Saving it to a temporary file us to retrieve it later when we run the gravity.sh script
+							echo ${IPv4addr%/*} > /tmp/piholeIP
+							echo $piholeInterface > /tmp/piholeINT
+							# After that's done, the loop ends and we move on
+							ipSettingsCorrect=True
+					else
+						# If the settings are wrong, the loop continues
+						ipSettingsCorrect=False
+					fi
 				else
-					# If the settings are wrong, the loop continues
+					# Cancelling gateway settings window
 					ipSettingsCorrect=False
+					echo "User canceled."
+					exit
 				fi
 			else
-				# Cancelling gateway settings window
+				# Cancelling IPv4 settings window
 				ipSettingsCorrect=False
 				echo "User canceled."
 				exit
 			fi
-		else
+		done
-		# Cancelling IPv4 settings window
+	# End the if statement for DHCP vs. static
-		ipSettingsCorrect=False
-		echo "User canceled."
-		exit
 	fi
-done
-# End the if statement for DHCP vs. static
-fi
 }
 
 setDHCPCD(){
-# Append these lines to dhcpcd.conf to enable a static IP
+	#Append these lines to dhcpcd.conf to enable a static IP
-echo "interface $piholeInterface
+	echo "interface $piholeInterface
-static ip_address=$IPv4addr
+	static ip_address=$IPv4addr
-static routers=$IPv4gw
+	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
 }
 
 setStaticIPv4(){
-if grep -q $IPv4addr $dhcpcdFile; then
+	if grep -q $IPv4addr $dhcpcdFile; then
-	# address already set, noop
+		# address already set, noop
-	:
+		:
-else
+	else
-	setDHCPCD
+		setDHCPCD
-	$SUDO ip addr replace dev $piholeInterface $IPv4addr
+		$SUDO ip addr replace dev $piholeInterface $IPv4addr
-	echo "Setting IP to $IPv4addr.  You may need to restart after the install is complete."
+		echo "Setting IP to $IPv4addr.  You may need to restart after the install is complete."
-fi
+	fi
 }
 
 installScripts(){
-$SUDO echo " "
+	$SUDO echo ":::"
-$SUDO echo "::: Installing scripts..."
+	$SUDO echo -n "::: Installing scripts..."
-#$SUDO rm /usr/local/bin/{gravity,chronometer,whitelist,blacklist,piholeLogFlush,updateDashboard}.sh
+	$SUDO cp /etc/.pihole/gravity.sh /usr/local/bin/gravity.sh	
-$SUDO curl -o /usr/local/bin/gravity.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity.sh
+	$SUDO cp /etc/.pihole/advanced/Scripts/chronometer.sh /usr/local/bin/chronometer.sh
-$SUDO curl -o /usr/local/bin/chronometer.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh
+	$SUDO cp /etc/.pihole/advanced/Scripts/whitelist.sh /usr/local/bin/whitelist.sh 
-$SUDO curl -o /usr/local/bin/whitelist.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/whitelist.sh
+	$SUDO cp /etc/.pihole/advanced/Scripts/blacklist.sh /usr/local/bin/blacklist.sh 
-$SUDO curl -o /usr/local/bin/blacklist.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/blacklist.sh
+	$SUDO cp /etc/.pihole/advanced/Scripts/piholeLogFlush.sh /usr/local/bin/piholeLogFlush.sh 
-$SUDO curl -o /usr/local/bin/piholeLogFlush.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/piholeLogFlush.sh
+	$SUDO cp /etc/.pihole/advanced/Scripts/updateDashboard.sh /usr/local/bin/updateDashboard.sh 
-$SUDO curl -o /usr/local/bin/updateDashboard.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/updateDashboard.sh
+	$SUDO chmod 755 /usr/local/bin/{gravity,chronometer,whitelist,blacklist,piholeLogFlush,updateDashboard}.sh
-$SUDO chmod 755 /usr/local/bin/{gravity,chronometer,whitelist,blacklist,piholeLogFlush,updateDashboard}.sh
+	$SUDO echo " done."
-$SUDO echo "::: ...done."
 }
 
 installConfigs(){
-$SUDO echo " "
+	$SUDO echo ":::"
-$SUDO echo "::: Installing configs..."
+	$SUDO echo -n "::: Installing configs..."
-$SUDO mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
+	$SUDO mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
-$SUDO mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
+	$SUDO mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
-$SUDO curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf
+	$SUDO cp /etc/.pihole/advanced/dnsmasq.conf /etc/dnsmasq.conf 
-$SUDO curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf
+	$SUDO cp /etc/.pihole/advanced/lighttpd.conf /etc/lighttpd/lighttpd.conf 
-$SUDO sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.conf
+	$SUDO sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.conf
-$SUDO echo "::: ...done."
+	$SUDO echo " done."
 }
 
 stopServices(){
-$SUDO echo " "
+	$SUDO echo ":::"
-$SUDO echo "::: Stopping services..."
+	$SUDO echo -n "::: Stopping services..."
-$SUDO service dnsmasq stop || true
+	$SUDO service dnsmasq stop & spinner $! || true 
-$SUDO service lighttpd stop || true
+	$SUDO service lighttpd stop & spinner $! || true 
-$SUDO echo "::: ...done."
+	$SUDO echo " done."
 }
 
-installDependencies(){
+checkForDependencies(){
-$SUDO echo " "
+ 		
-$SUDO echo "::: Updating apt-get package list"
+ 		#Running apt-get update/upgrade with minimal output can cause some issues with
-$SUDO apt-get -qq update & spinner $!
+ 		#requiring user input (e.g password for phpmyadmin see #218)
-$SUDO echo "::: Upgrading apt-get packages"
+ 		#We'll change the logic up here, to check to see if there are any updates availible and
-$SUDO apt-get -yqq upgrade & spinner $!
+ 		# if so, advise the user to run apt-get update/upgrade at their own discretion
-$SUDO echo "::: ...done."
+ 		
-$SUDO echo "::: installing dnsutils, bc, toilet, and figlet..."
+ 		today=$(date "+%b %e")
-$SUDO apt-get -yqq install dnsutils bc toilet figlet & spinner $!
+ 		echo ":::"
-$SUDO echo "::: ...done."
+ 		echo -n "::: Checking apt-get for upgraded packages...."
-$SUDO echo "::: Installing dnsmasq..."
+ 		updatesToInstall=$(sudo apt-get -s -o Debug::NoLocking=true upgrade | grep -c ^Inst) & spinner $!
-$SUDO apt-get -yqq install dnsmasq & spinner $!
+ 		echo " done!"
-$SUDO echo "::: ...done."
+		
-$SUDO echo "::: Installing lighttpd, php5-common, php5-cgi, and php5..."
+		echo ":::"
-$SUDO apt-get -yqq install lighttpd php5-common php5-cgi php5 & spinner $!
+		if [ $updatesToInstall > 0 ]; then
-$SUDO echo "::: ...done."
+			echo "::: There are $updatesToInstall updates availible for your pi!"
-$SUDO echo "::: Installing git..."
+			echo "::: Please consider running 'sudo apt-get update', followed by 'sudo apt-get upgrade'"
-$SUDO apt-get -yqq install git & spinner $!
+			echo "::: after pi-hole has finished installing."
-$SUDO echo "::: ...done."
+			echo ":::"
+			#add in a prompt to give users the option to quit installation or continue
+			echo -n "::: Would you like to continue with the pi-hole installation? (Y/n):"
+			read answer
+			
+			case "$answer" in
+    		[yY][eE][sS]|[yY]  )  echo "::: Continuing!";;
+   		  *                  )  echo "::: Quitting install, please run 'curl -L install.pi-hole.net | bash' after updating packages!"
+              								exit 0;;
+			esac 			
+			
+		else
+		  echo "::: Your pi is up to date! Continuing with pi-hole installation..."
+		fi    
+    
+    echo ":::" 
+    echo "::: Checking dependencies:"
+
+    dependencies=( dnsutils bc toilet figlet dnsmasq lighttpd php5-common php5-cgi php5 git curl unzip wget )
+    for i in "${dependencies[@]}"
+    do
+       :
+      echo -n ":::    Checking for $i..."
+      if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
+          echo -n " Not found! Installing...."
+          $SUDO apt-get -y -qq install $i > /dev/null & spinner $!
+          echo " done!"
+      else
+          echo " already installed!"
+      fi
+    done
 }
 
-installWebAdmin(){
+getGitFiles(){
-$SUDO echo " "
-$SUDO echo "::: Downloading and installing latest WebAdmin files..."
-if [ -d "/var/www/html/admin" ]; then	
-  $SUDO rm -rf /var/www/html/admin
-fi
-if [ -d "/var/www/html/AdminLTE-master" ]; then
-  $SUDO rm -rf /var/www/html/AdminLTE-master
-fi
-$SUDO wget -nv https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip & spinner $!
-$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 echo "::: ...Done."
   
-$SUDO echo "::: Creating log file and changing owner to dnsmasq..."
+  echo ":::"
-if [ ! -f /var/log/pihole.log ]; then
+	echo "::: Checking for existing base files..."
-	$SUDO touch /var/log/pihole.log
+	if is_repo $piholeFilesDir; then				
-	$SUDO chmod 644 /var/log/pihole.log
+        make_repo $piholeFilesDir $piholeGitUrl        
-	$SUDO chown dnsmasq:root /var/log/pihole.log	
+  else  		
-else
+  		update_repo $piholeFilesDir  		
-	$SUDO echo "::: No need to create, already exists!"
+  fi
-fi
+
-$SUDO echo "::: ...done."
+  echo ":::"  
+  echo "::: Checking for existing web interface..."
+  if is_repo $webInterfaceDir; then  		
+  		make_repo $webInterfaceDir $webInterfaceGitUrl  		
+  else
+  		update_repo $webInterfaceDir
+  		
+  fi
+
+}
+
+is_repo() {
+		echo -n ":::    Checking $1 is a repo..."
+    # if the directory does not have a .git folder 
+    # it is not a repo
+    if [ -d "$1/.git" ]; then
+    		echo " OK!"
+        return 1
+    fi
+    echo " not found!!"
+    return 0
+    
+}
+
+make_repo() {
+    # remove the non-repod interface and clone the interface
+    echo -n ":::    Cloning $2 into $1..."
+    $SUDO rm -rf $1
+    $SUDO git clone -q "$2" "$1" > /dev/null & spinner $!
+    echo " done!"
+}
+
+update_repo() {
+    # pull the latest commits
+    echo -n ":::     Updating repo in $1..."
+    cd "$1"
+    $SUDO git pull -q > /dev/null & spinner $!
+    echo " done!"
+}
+
+
+CreateLogFile(){
+	echo ":::"
+	$SUDO  echo -n "::: Creating log file and changing owner to dnsmasq..."
+	if [ ! -f /var/log/pihole.log ]; then
+		$SUDO touch /var/log/pihole.log
+		$SUDO chmod 644 /var/log/pihole.log
+		$SUDO chown dnsmasq:root /var/log/pihole.log
+		$SUDO echo " done!"
+	else
+		$SUDO  echo " already exists!"
+	fi
 	
 }
 
 installPiholeWeb(){
-$SUDO echo " "
+	$SUDO echo ":::"
-$SUDO echo "::: Downloading and installing pihole custom index page..."
+	$SUDO echo -n "::: Installing pihole custom index page..."
-if [ -d "/var/www/html/pihole" ]; then	
+	if [ -d "/var/www/html/pihole" ]; then
-  $SUDO echo "::: Existing page detected, not overwriting"
+		$SUDO echo " Existing page detected, not overwriting"
-else  
+	else
-	$SUDO mkdir /var/www/html/pihole
+		$SUDO mkdir /var/www/html/pihole
-	$SUDO mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
+		$SUDO mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
-	$SUDO curl -o /var/www/html/pihole/index.html https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html	
+		$SUDO cp /etc/.pihole/advanced/index.html /var/www/html/pihole/index.html
-fi
+		$SUDO echo " done!"
-$SUDO echo "::: ...done."
+	fi
+	
 }
 
 installCron(){
-$SUDO echo " "
+	$SUDO echo ":::"
-$SUDO echo "::: Downloading latest Cron script..."
+	$SUDO echo -n "::: Installing latest Cron script..."
-$SUDO curl -o /etc/cron.d/pihole https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/pihole.cron
+	$SUDO cp /etc/.pihole/advanced/pihole.cron /etc/cron.d/pihole
-$SUDO echo "::: ...done."
+	$SUDO echo " done!"
 }
 
-runGravity()
+runGravity(){
-{
+	$SUDO echo ":::"
-$SUDO echo " "
+	$SUDO echo "::: Preparing to run gravity.sh to refresh hosts..."
-$SUDO echo "::: Preparing to run gravity.sh to refresh hosts..."
+	if ls /etc/pihole/list* 1> /dev/null 2>&1; then
-if ls /etc/pihole/list* 1> /dev/null 2>&1; then
+		echo "::: Cleaning up previous install (preserving whitelist/blacklist)"
-    echo "::: Cleaning up previous install (preserving whitelist/blacklist)"
+		$SUDO rm /etc/pihole/list.*
-    $SUDO rm /etc/pihole/list.*
+	fi
-fi
+	#Don't run as SUDO, this was causing issues
-#Don't run as SUDO, this was causing issues
+	echo "::: Running gravity.sh"
-/usr/local/bin/gravity.sh
+	echo ":::"
-$SUDO echo "::: ...done."
+	
+	/usr/local/bin/gravity.sh
+	
 }
 
 
-installPihole()
+installPihole(){
-{
+	checkForDependencies # done
-installDependencies
+	stopServices
-stopServices
-$SUDO chown www-data:www-data /var/www/html
-$SUDO chmod 775 /var/www/html
-$SUDO usermod -a -G www-data pi
-$SUDO lighty-enable-mod fastcgi fastcgi-php
-installScripts
-installConfigs
-installWebAdmin
-installPiholeWeb
-installCron
-runGravity
 	
+	$SUDO chown www-data:www-data /var/www/html
+	$SUDO chmod 775 /var/www/html
+	$SUDO usermod -a -G www-data pi
+	$SUDO lighty-enable-mod fastcgi fastcgi-php > /dev/null
+	
+	getGitFiles	
+	installScripts
+	installConfigs
+	#installWebAdmin
+	CreateLogFile
+	installPiholeWeb
+	installCron
+	runGravity
 }
 
 displayFinalMessage(){
-	whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Configure your devices to use the Pi-hole as their DNS server using:
+whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Configure your devices to use the Pi-hole as their DNS server using:
 
-						$IPv4addr
+$IPv4addr
-						$piholeIPv6
+$piholeIPv6
 
 If you set a new IP address, you should restart the Pi.
 
@@ -403,14 +481,13 @@ welcomeDialogs
 
 # Just back up the original Pi-hole right away since it won't take long and it gets it out of the way
 backupLegacyPihole
-
 # Find interfaces and let the user choose one
 chooseInterface
-
 # Let the user decide if they want to block ads over IPv4 and/or IPv6
 use4andor6
 
 
+
 # Install and log everything to a file
 installPihole | tee $tmpLog
 

gravity.sh

@@ -10,8 +10,25 @@
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 
+# Run this script as root or under sudo
+echo ":::"
+if [[ $EUID -eq 0 ]];then
+	echo "::: You are root."
+else
+	echo "::: sudo will be used."
+  # Check if it is actually installed
+  # If it isn't, exit because the install cannot complete
+  if [[ $(dpkg-query -s sudo) ]];then
+		export SUDO="sudo"
+  else
+		echo "::: Please install sudo or run this script as root."
+    exit 1
+  fi
+fi
+
 piholeIPfile=/tmp/piholeIP
 piholeIPv6file=/etc/pihole/.useIPv6
+
 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)
@@ -38,7 +55,8 @@ sources=('https://adaway.org/hosts.txt'
 'http://www.malwaredomainlist.com/hostslist/hosts.txt'
 'http://pgl.yoyo.org/adservers/serverlist.php?'
 'http://someonewhocares.org/hosts/hosts'
-'http://winhelp2002.mvps.org/hosts.txt')
+'http://winhelp2002.mvps.org/hosts.txt'
+'http://mirror1.malwaredomains.com/files/justdomains')
 
 # Variables for various stages of downloading and formatting the list
 basename=pihole
@@ -56,25 +74,43 @@ eyeOfTheNeedle=$basename.4.wormhole.txt
 
 # After setting defaults, check if there's local overrides
 if [[ -r $piholeDir/pihole.conf ]];then
-    echo "** Local calibration requested..."
+    echo "::: Local calibration requested..."
         . $piholeDir/pihole.conf
 fi
 
+
+spinner(){
+        local pid=$1
+        local delay=0.001
+        local spinstr='/-\|'
+
+        spin='-\|/'
+        i=0
+        while $SUDO kill -0 $pid 2>/dev/null
+        do
+                i=$(( (i+1) %4 ))
+                printf "\b${spin:$i:1}"
+                sleep .1
+        done
+        printf "\b"
+}
 ###########################
 # collapse - begin formation of pihole
 function gravity_collapse() {
-	echo "** Neutrino emissions detected..."
+	echo -n "::: 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
+        $SUDO chmod 777 $piholeDir
-        find "$piholeDir" -type f -exec sudo chmod 666 {} \;
+        find "$piholeDir" -type f -exec $SUDO chmod 666 {} \; & spinner $!
+        echo "."
 	else
-        echo "** Creating pihole directory..."
+        echo -n "::: Creating pihole directory..."
-        mkdir $piholeDir
+        mkdir $piholeDir & spinner $!
+        echo " done!"
 	fi
 }
 
@@ -87,10 +123,10 @@ function gravity_patternCheck() {
 		# and stored as is. They can be processed for content after they
 		# have been saved.
 		cp $patternBuffer $saveLocation
-		echo "List updated, transport successful..."
+		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..."
+		echo " No changes detected, transport skipped!"
 	fi
 }
 
@@ -119,7 +155,7 @@ function gravity_transport() {
 
 # spinup - main gravity function
 function gravity_spinup() {
-
+  echo "::: "
 	# 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
@@ -133,7 +169,7 @@ function gravity_spinup() {
 
         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
@@ -156,27 +192,37 @@ function gravity_spinup() {
 
 # Schwarzchild - aggregate domains to one list and add blacklisted domains
 function gravity_Schwarzchild() {
-
+  echo "::: "
 	# Find all active domains and compile them into one file and remove CRs
-	echo "** Aggregating list of domains..."
+	echo -n "::: Aggregating list of domains..."
-	truncate -s 0 $piholeDir/$matterandlight
+	truncate -s 0 $piholeDir/$matterandlight & spinner $! 
 	for i in "${activeDomains[@]}"
 	do
    		cat $i |tr -d '\r' >> $piholeDir/$matterandlight
 	done
+	echo " done!"
+	
 }
 
 
 function gravity_Blacklist(){
 	# Append blacklist entries if they exist
-	blacklist.sh -f -nr -q
+	echo -n "::: Running blacklist script to update HOSTS file...."
+	blacklist.sh -f -nr -q > /dev/null & spinner $!
+	
+	numBlacklisted=$(wc -l < "/etc/pihole/blacklist.txt")
+	plural=; [[ "$numBlacklisted" != "1" ]] && plural=s
+  echo " $numBlacklisted domain${plural} blacklisted!"
+  
+	
 }
 
 
 function gravity_Whitelist() {
+  echo ":::"
 	# Prevent our sources from being pulled into the hole
 	plural=; [[ "${sources[@]}" != "1" ]] && plural=s
-	echo "** Whitelisting ${#sources[@]} ad list source${plural}..."
+	echo -n "::: Adding ${#sources[@]} ad list source${plural} to the whitelist..."
 	
 	urls=()
 	for url in ${sources[@]}
@@ -184,28 +230,42 @@ function gravity_Whitelist() {
         tmp=$(echo "$url" | awk -F '/' '{print $3}')
         urls=("${urls[@]}" $tmp)
 	done
+	echo " done!"
+	
+	echo -n "::: Running whitelist script to update HOSTS file...."
+	whitelist.sh -f -nr -q ${urls[@]} > /dev/null & spinner $!
+		
+	numWhitelisted=$(wc -l < "/etc/pihole/whitelist.txt")
+	plural=; [[ "$numWhitelisted" != "1" ]] && plural=s
+  echo " $numWhitelisted domain${plural} whitelisted!"
   
-	whitelist.sh -f -nr -q ${urls[@]}
   
 		
 }
 
 function gravity_unique() {
 	# Sort and remove duplicates
-	sort -u  $piholeDir/$supernova > $piholeDir/$eventHorizon
+	echo -n "::: Removing duplicate domains...."
+	sort -u  $piholeDir/$supernova > $piholeDir/$eventHorizon  & spinner $!
+	echo " done!"
 	numberOf=$(wc -l < $piholeDir/$eventHorizon)
-	echo "** $numberOf unique domains trapped in the event horizon."
+	echo "::: $numberOf unique domains trapped in the event horizon."
 }
 
 function gravity_hostFormat() {
-	# Format domain list as "192.168.x.x domain.com"
+  # Format domain list as "192.168.x.x domain.com"
-	echo "** Formatting domains into a HOSTS file..."
+	echo "::: Formatting domains into a HOSTS file..."
   # 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
+  	#Add dummy domain Pi-Hole.IsWorking.OK to the top of gravity.list to make ping result return a friendlier looking domain!
+    echo -e "$piholeIP Pi-Hole.IsWorking.OK \n$piholeIPv6 Pi-Hole.IsWorking.OK" > $piholeDir/$accretionDisc
+    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
+      # Otherwise, just create gravity.list as normal using IPv4
-    cat $piholeDir/$eventHorizon | awk -v ipv4addr="$piholeIP" '{sub(/\r$/,""); print ipv4addr" "$0}' > $piholeDir/$accretionDisc
+      #Add dummy domain Pi-Hole.IsWorking.OK to the top of gravity.list to make ping result return a friendlier looking domain!
+    echo -e "$piholeIP Pi-Hole.IsWorking.OK" > $piholeDir/$accretionDisc
+    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
@@ -232,26 +292,31 @@ function gravity_advanced() {
 	# 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/$matterandlight | sed -nr -e 's/\.{2,}/./g' -e '/\./p' >  $piholeDir/$supernova
+	echo -n "::: Formatting list of domains to remove comments...."
+	awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' $piholeDir/$matterandlight | sed -nr -e 's/\.{2,}/./g' -e '/\./p' >  $piholeDir/$supernova & spinner $!
+  echo " done!"
   
 	numberOf=$(wc -l < $piholeDir/$supernova)
-	echo "** $numberOf domains being pulled in by gravity..."
+	echo "::: $numberOf domains being pulled in by gravity..."
     
 	gravity_unique
+  
 }
 
 function gravity_reload() {
 	# Reload hosts file
-	echo "** Refresh lists in dnsmasq..."
+	echo ":::"
+	echo -n "::: Refresh lists in dnsmasq..."
 	dnsmasqPid=$(pidof dnsmasq)
 
 	if [[ $dnsmasqPid ]]; then
 		# service already running - reload config
-		sudo kill -HUP $dnsmasqPid
+		$SUDO kill -HUP $dnsmasqPid & spinner $!
 	else
 		# service not running, start it up
-		sudo service dnsmasq start
+		$SUDO service dnsmasq start & spinner $!
 	fi
+	echo " done!"
 }