From 4229a3e5e9835a38c3c19b2e4ad483c03706fd11 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Wed, 28 Oct 2015 17:29:34 -0500
Subject: [PATCH 01/20] whiptail revamp of install script

This is a large update that helps users install the Pi-hole a bit
easier by using some dialog windows and also letting the user set a
static IP (I still need to figure out how to actually set the address
in the system, but everything else having to do with the install script
works).
---
 automated install/basic-install.sh | 249 ++++++++++++++++++++---------
 1 file changed, 174 insertions(+), 75 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 7c48fdba..416c4217 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -1,29 +1,37 @@
 #!/bin/bash
-# Pi-hole automated install
-# Raspberry Pi Ad-blocker
+# Pi-hole: A black hole for Internet advertisements
+# by Jacob Salmela
+# Network-wide ad blocking via your Raspberry Pi
 #
-# Install with this command (from the Pi):
+# pi-hole.net/donate
 #
-# curl -s "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/automated%20install/basic-install.sh" | bash
+# Install with this command (from your Pi):
 #
-# Or run the commands below in order
-
-clear
-echo "  _____ _        _           _      "
-echo " |  __ (_)      | |         | |     "
-echo " | |__) |   __  | |__   ___ | | ___ "
-echo " |  ___/ | |__| | '_ \ / _ \| |/ _ \ "
-echo " | |   | |      | | | | (_) | |  __/ "
-echo " |_|   |_|      |_| |_|\___/|_|\___| "
-echo "                                    "
-echo "      Raspberry Pi Ad-blocker       "
-echo "									  "
-echo "Set a static IP before running this!"
-echo "			             			  "
-echo "	    Press Enter when ready        "
-echo "									  "
-read
+# curl -L install.pi-hole.net | bash
 
+######## VARIABLES #########
+# Get the screen size in case we need a full-screen message and so we can display a dialog that is sized nicely
+screenSize=$(stty -a | tr \; \\012 | egrep 'rows|columns' | cut '-d ' -f3)
+
+# Find the rows and columns
+rows=$(stty -a | tr \; \\012 | egrep 'rows' | cut -d' ' -f3)
+columns=$(stty -a | tr \; \\012 | egrep 'columns' | cut -d' ' -f3)
+
+# Divide by two so the dialogs take up half of the screen, which looks nice.
+r=$(( rows / 2 ))
+c=$(( columns / 2 ))
+
+# Get the current network settings
+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}')
+
+# IPv6 support to be added later
+IPv6addr=$(ip addr show | awk '/scope\ global/ && /ff:fe/ {print $2}' | cut -d'/' -f1)
+
+####### FUCNTIONS ##########
+backupLegacyPihole()
+{
 if [[ -f /etc/dnsmasq.d/adList.conf ]];then
 	echo "Original Pi-hole detected.  Initiating sub space transport..."
 	sudo mkdir -p /etc/pihole/original/
@@ -36,58 +44,149 @@ if [[ -f /etc/dnsmasq.d/adList.conf ]];then
 else
 	:
 fi
+}
+
+######## SCRIPT ############
+# Just back up the original Pi-hole right away since it won't take long and it gets it out of the way
+backupLegacyPihole
+
+# 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
+
+# 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
+
+# Ask if the user wannts to use DHCP settings as their static IP
+if (whiptail --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.
+
+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 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
+				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 --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
+							# 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
+					# Cancelling gateway settings window
+					ipSettingsCorrect=False
+					echo "User canceled."
+					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."
+		exit
+	fi
+	done
+# End the if statement for DHCP vs. static
+fi
+
+# These are the commands to actually install the Pi-hole
+# Create an associative array so we can display text to the user but run the associated command in the background.
+declare -A cmdsAndEchoes=([sudo apt-get update]='Updating...'
+[sudo apt-get -y upgrade]='Upgrading...'
+[sudo apt-get -y install dnsutils bc toilet]='Installing chronomoter tools...'
+[sudo apt-get -y install dnsmasq]='Installing a DNS server...'
+[sudo apt-get -y install lighttpd php5-common php5-cgi php5]='Instaling a Web server and PHP...'
+[sudo mkdir /var/www/html]='Making an HTML folder...'
+[sudo chown www-data:www-data /var/www/html]='Setting permissions for the Web server...'
+[sudo chmod 775 /var/www/html]='Setting permissions for the Web server...'
+[sudo usermod -a -G www-data pi]='Setting permissions for the Web server...'
+[sudo service dnsmasq stop]='Stopping dnsmasq to modify it...'
+[sudo service lighttpd stop]='Stopping lighttpd to modify it...'
+[sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig]='Backing up the dnsmasq config file...'
+[sudo mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig]='Backing up the lighttpd config file...'
+[sudo mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig]='Backing up the default Web page...'
+[sudo curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf]='Installing the dnsmasq config file...'
+[sudo curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf]='Installing the lighttpd config file...'
+[sudo lighty-enable-mod fastcgi fastcgi-php]='Enabling PHP...'
+[sudo mkdir /var/www/html/pihole]='Making a directory for the Web interface...'
+[sudo curl -o /var/www/html/pihole/index.html https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html]='Installing a blank HTML page to take place of ads...'
+[sudo wget https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip]='Downloading the Pi-hole dashboard...'
+[sudo unzip /var/www/master.zip -d /var/www/html/]='Unpacking the dashboard...'
+[sudo mv /var/www/html/AdminLTE-master /var/www/html/admin]='Renaming the dashboard...'
+[sudo rm /var/www/master.zip 2>/dev/null]='Cleaning up the dashboard temp files...'
+[sudo touch /var/log/pihole.log]='Creating a log file for the Pi-hole...'
+[sudo chmod 644 /var/log/pihole.log]='Making sure the log is readable...'
+[sudo chown dnsmasq:root /var/log/pihole.log]='Letting dnsmasq see the log file so stats can be displayed...'
+[sudo curl -o /usr/local/bin/gravity.sh "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity.sh"]='Initating sub-space transport...'
+[sudo curl -o /usr/local/bin/chronometer.sh "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh"]='Initating sub-space transport...'
+[sudo chmod 755 /usr/local/bin/gravity.sh]='Making the scripts executable...'
+[sudo chmod 755 /usr/local/bin/chronometer.sh]='Making the scripts executable...'
+[sudo /usr/local/bin/gravity.sh]='Entering the event horizion...'
+[sudo reboot]='Restarting...')
+
+# Everything in the parentheses is part of displaying the progress bar
+(
+# Get total number of commands to be run from the array
+n=${#cmdsAndEchoes[*]};
+
+# Set counter to increase every time a loop completes
+i=0
+
+# For each key in the array
+for key in "${!cmdsAndEchoes[@]}"
+do
+
+# Calculate the overall progress
+percent=$(( 100*(++i)/n ))
 
-echo "Updating the Pi..."
-sudo apt-get update
-sudo apt-get -y upgrade
-
-echo "Installing tools..."
-sudo apt-get -y install dnsutils
-sudo apt-get -y install bc
-sudo apt-get -y install toilet
-
-echo "Installing DNS..."
-sudo apt-get -y install dnsmasq
-sudo update-rc.d dnsmasq enable
-
-echo "Installing a Web server"
-sudo apt-get -y install lighttpd php5-common php5-cgi php5
-sudo mkdir /var/www/html
-sudo chown www-data:www-data /var/www/html
-sudo chmod 775 /var/www/html
-sudo usermod -a -G www-data pi
-
-echo "Stopping services to modify them..."
-sudo service dnsmasq stop
-sudo service lighttpd stop
-
-echo "Backing up original config files and downloading Pi-hole ones..."
-sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
-sudo mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
-sudo mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
-sudo curl -o /etc/dnsmasq.conf "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf"
-sudo curl -o /etc/lighttpd/lighttpd.conf "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf"
-sudo lighty-enable-mod fastcgi fastcgi-php
-sudo mkdir /var/www/html/pihole
-sudo curl -o /var/www/html/pihole/index.html "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html"
-
-echo "Installing the Web interface..."
-sudo wget https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip
-sudo unzip /var/www/master.zip -d /var/www/html/
-sudo mv /var/www/html/AdminLTE-master /var/www/html/admin
-sudo rm /var/www/master.zip 2>/dev/null
-sudo touch /var/log/pihole.log
-sudo chmod 644 /var/log/pihole.log
-sudo chown dnsmasq:root /var/log/pihole.log
-
-echo "Locating the Pi-hole..."
-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 chmod 755 /usr/local/bin/gravity.sh
-sudo chmod 755 /usr/local/bin/chronometer.sh
-
-echo "Entering the event horizon..."
-sudo /usr/local/bin/gravity.sh
-
-echo "Restarting..."
-sudo reboot
+# Update dialog box using the value of each key in the array
+# Show the percentage and the echo messages from the array
+cat <<EOF
+XXX
+$percent
+${cmdsAndEchoes[$key]}
+XXX
+EOF
+# Execute the command in the background (hidden from the user, not actually a background process)
+$key
+done
+# As the loop is progressing, the output is sent to whiptail to be displayed to the user
+) |
+whiptail --title "Opening your Pi-hole..." --gauge "Please wait..." $r $c 0

From dfe1b126c40b9f586d0f2aee1d15497c7df70826 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Thu, 29 Oct 2015 20:10:30 -0500
Subject: [PATCH 02/20] progress dialog working

The ellipses cause errors, so they were removed.

I was on the right track with the associate array, but it would
previously execute the commands out of order.  Following directions
from the URL in the comments, I made another array that helps keep the
array in the order.
---
 automated install/basic-install.sh | 96 ++++++++++++++++--------------
 1 file changed, 50 insertions(+), 46 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 416c4217..56beee85 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -33,7 +33,7 @@ IPv6addr=$(ip addr show | awk '/scope\ global/ && /ff:fe/ {print $2}' | cut -d'/
 backupLegacyPihole()
 {
 if [[ -f /etc/dnsmasq.d/adList.conf ]];then
-	echo "Original Pi-hole detected.  Initiating sub space transport..."
+	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")
@@ -51,10 +51,10 @@ fi
 backupLegacyPihole
 
 # 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
+whiptail --msgbox --backtitle "Welcome" --title "Pi-hole automated installer" "This installer will transform your Raspberry Pi into a network-wide ad blocker!" $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.
+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
 
@@ -65,7 +65,7 @@ if (whiptail --title "Static IP Address" --yesno "Do you want to use your curren
 							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.
+	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.
 
@@ -78,15 +78,15 @@ else
 	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)
+	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)
+		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
-				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)
+				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
@@ -127,50 +127,52 @@ else
 fi
 
 # These are the commands to actually install the Pi-hole
-# Create an associative array so we can display text to the user but run the associated command in the background.
-declare -A cmdsAndEchoes=([sudo apt-get update]='Updating...'
-[sudo apt-get -y upgrade]='Upgrading...'
-[sudo apt-get -y install dnsutils bc toilet]='Installing chronomoter tools...'
-[sudo apt-get -y install dnsmasq]='Installing a DNS server...'
-[sudo apt-get -y install lighttpd php5-common php5-cgi php5]='Instaling a Web server and PHP...'
-[sudo mkdir /var/www/html]='Making an HTML folder...'
-[sudo chown www-data:www-data /var/www/html]='Setting permissions for the Web server...'
-[sudo chmod 775 /var/www/html]='Setting permissions for the Web server...'
-[sudo usermod -a -G www-data pi]='Setting permissions for the Web server...'
-[sudo service dnsmasq stop]='Stopping dnsmasq to modify it...'
-[sudo service lighttpd stop]='Stopping lighttpd to modify it...'
-[sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig]='Backing up the dnsmasq config file...'
-[sudo mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig]='Backing up the lighttpd config file...'
-[sudo mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig]='Backing up the default Web page...'
-[sudo curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf]='Installing the dnsmasq config file...'
-[sudo curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf]='Installing the lighttpd config file...'
-[sudo lighty-enable-mod fastcgi fastcgi-php]='Enabling PHP...'
-[sudo mkdir /var/www/html/pihole]='Making a directory for the Web interface...'
-[sudo curl -o /var/www/html/pihole/index.html https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html]='Installing a blank HTML page to take place of ads...'
-[sudo wget https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip]='Downloading the Pi-hole dashboard...'
-[sudo unzip /var/www/master.zip -d /var/www/html/]='Unpacking the dashboard...'
-[sudo mv /var/www/html/AdminLTE-master /var/www/html/admin]='Renaming the dashboard...'
-[sudo rm /var/www/master.zip 2>/dev/null]='Cleaning up the dashboard temp files...'
-[sudo touch /var/log/pihole.log]='Creating a log file for the Pi-hole...'
-[sudo chmod 644 /var/log/pihole.log]='Making sure the log is readable...'
-[sudo chown dnsmasq:root /var/log/pihole.log]='Letting dnsmasq see the log file so stats can be displayed...'
-[sudo curl -o /usr/local/bin/gravity.sh "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity.sh"]='Initating sub-space transport...'
-[sudo curl -o /usr/local/bin/chronometer.sh "https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh"]='Initating sub-space transport...'
-[sudo chmod 755 /usr/local/bin/gravity.sh]='Making the scripts executable...'
-[sudo chmod 755 /usr/local/bin/chronometer.sh]='Making the scripts executable...'
-[sudo /usr/local/bin/gravity.sh]='Entering the event horizion...'
-[sudo reboot]='Restarting...')
+# This is pretty ugly, but it works to present a nice front-end
+# http://stackoverflow.com/questions/29161323/how-to-keep-associative-array-order-in-bash
+# Maybe it would be better to just show the command output instead of the progress bar
+declare -A commands;      declare -a echoes;
+commands["Updating"]="sudo apt-get update"; echoes+=( "Updating" )
+commands["Upgrading"]="sudo apt-get -y upgrade"; echoes+=( "Upgrading" )
+commands["Installing chronomoter tools"]="sudo apt-get -y install dnsutils bc toilet"; echoes+=( "Installing chronomoter tools" )
+commands["Installing a DNS server"]="sudo apt-get -y install dnsmasq"; echoes+=( "Installing a DNS server" )
+commands["Instaling a Web server and PHP"]="sudo apt-get -y install lighttpd php5-common php5-cgi php5"; echoes+=( "Instaling a Web server and PHP" )
+commands["Making an HTML folder"]="sudo mkdir /var/www/html"; echoes+=( "Making an HTML folder" )
+commands["chowning the Web server"]="sudo chown www-data:www-data /var/www/html"; echoes+=( "chowning the Web server" )
+commands["chmodding the Web server"]="sudo chmod 775 /var/www/html"; echoes+=( "chmodding the Web server" )
+commands["Giving pi access to the Web server"]="sudo usermod -a -G www-data pi"; echoes+=( "Giving pi access to the Web server" )
+commands["Stopping dnsmasq to modify it"]="sudo service dnsmasq stop"; echoes+=( "Stopping dnsmasq to modify it" )
+commands["Stopping lighttpd to modify it"]="sudo service lighttpd stop"; echoes+=( "Stopping lighttpd to modify it" )
+commands["Backing up the dnsmasq config file"]="sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig"; echoes+=( "Backing up the dnsmasq config file" )
+commands["Backing up the lighttpd config file"]="sudo mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig"; echoes+=( "Backing up the lighttpd config file" )
+commands["Backing up the default Web page"]="sudo mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig"; echoes+=( "Backing up the default Web page" )
+commands["Installing the dnsmasq config file"]="sudo curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf"; echoes+=( "Installing the dnsmasq config file" )
+commands["Installing the lighttpd config file"]="sudo curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf"; echoes+=( "Installing the lighttpd config file" )
+commands["Enabling PHP"]="sudo lighty-enable-mod fastcgi fastcgi-php"; echoes+=( "Enabling PHP" )
+commands["Making a directory for the Web interface"]="sudo mkdir /var/www/html/pihole"; echoes+=( "Making a directory for the Web interface" )
+commands["Installing a blank HTML page to take place of ads"]="sudo curl -o /var/www/html/pihole/index.html https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html"; echoes+=( "Installing a blank HTML page to take place of ads" )
+commands["Downloading the Pi-hole dashboard"]="sudo wget https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip"; echoes+=( "Downloading the Pi-hole dashboard" )
+commands["Unpacking the dashboard"]="sudo unzip /var/www/master.zip -d /var/www/html/"; echoes+=( "Unpacking the dashboard" )
+commands["Renaming the dashboard"]="sudo mv /var/www/html/AdminLTE-master /var/www/html/admin"; echoes+=( "Renaming the dashboard" )
+commands["Cleaning up the dashboard temp files"]="sudo rm /var/www/master.zip 2>/dev/null"; echoes+=( "Cleaning up the dashboard temp files" )
+commands["Creating a log file for the Pi-hole"]="sudo touch /var/log/pihole.log"; echoes+=( "Creating a log file for the Pi-hole" )
+commands["chmodding the log file"]="sudo chmod 644 /var/log/pihole.log"; echoes+=( "chmodding the log file" )
+commands["chowning the log file so stats can be displayed"]="sudo chown dnsmasq:root /var/log/pihole.log"; echoes+=( "chowning the log file so stats can be displayed" )
+commands["Initating sub-space transport of gravity"]="sudo curl -o /usr/local/bin/gravity.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity.sh"; echoes+=( "Initating sub-space transport of gravity" )
+commands["Initating sub-space transport of chronometer"]="sudo curl -o /usr/local/bin/chronometer.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh"; echoes+=( "Initating sub-space transport of chronometer" )
+commands["chmodding gravity"]="sudo chmod 755 /usr/local/bin/gravity.sh"; echoes+=( "chmodding gravity" )
+commands["chmodding the chronometer"]="sudo chmod 755 /usr/local/bin/chronometer.sh"; echoes+=( "chmodding the chronometer" )
+commands["Entering the event horizion"]="sudo /usr/local/bin/gravity.sh"; echoes+=( "Entering the event horizion" )
+commands["Rebooting"]="sudo reboot"; echoes+=( "Rebooting" )
 
 # Everything in the parentheses is part of displaying the progress bar
 (
 # Get total number of commands to be run from the array
-n=${#cmdsAndEchoes[*]};
-
+n=${#commands[*]};
 # Set counter to increase every time a loop completes
 i=0
 
-# For each key in the array
-for key in "${!cmdsAndEchoes[@]}"
+# For each item in the array
+for k in "${!echoes[@]}"
 do
 
 # Calculate the overall progress
@@ -181,11 +183,13 @@ percent=$(( 100*(++i)/n ))
 cat <<EOF
 XXX
 $percent
-${cmdsAndEchoes[$key]}
+Step $i of $n: ${echoes[$k]}
 XXX
 EOF
 # Execute the command in the background (hidden from the user, not actually a background process)
-$key
+#${echoes[$k]}
+${commands[${echoes[$k]}]}
+sleep 1
 done
 # As the loop is progressing, the output is sent to whiptail to be displayed to the user
 ) |

From 72cf5c91a556d96dcd66828d293ad5e93c790d23 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sat, 31 Oct 2015 09:11:29 -0500
Subject: [PATCH 03/20] set static ip and suppress more output

Created a function to set a static IP address.

I also sent STDOUT and STDERR to /dev/null so it doesn't mangle the
progress bar.  When the device reboots, it still gets mangled a bit
(via ssh).
---
 automated install/basic-install.sh | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 56beee85..ea513060 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -27,7 +27,10 @@ IPv4mask=$(ifconfig | awk -F':' '/inet addr/ && !/127.0.0.1/ {print $4}')
 IPv4gw=$(ip route show | awk '/default\ via/ {print $3}')
 
 # IPv6 support to be added later
-IPv6addr=$(ip addr show | awk '/scope\ global/ && /ff:fe/ {print $2}' | cut -d'/' -f1)
+#IPv6addr=$(ip addr show | awk '/scope\ global/ && /ff:fe/ {print $2}' | cut -d'/' -f1)
+
+ethernetDevice="eth0"
+dhcpcdFile=/etc/dhcpcd.conf
 
 ####### FUCNTIONS ##########
 backupLegacyPihole()
@@ -46,6 +49,15 @@ else
 fi
 }
 
+set_static_ip()
+{
+# Append these lines to /etc/dhcpcd.conf to enable a static IP
+echo "interface $ethernetDevice
+static ip_address=$IPv4addr/24
+static routers=$IPv4gw
+static domain_name_servers=$IPv4gw" | sudo tee -a $dhcpcdFile >/dev/null
+}
+
 ######## SCRIPT ############
 # Just back up the original Pi-hole right away since it won't take long and it gets it out of the way
 backupLegacyPihole
@@ -59,7 +71,7 @@ whiptail --msgbox --backtitle "Initating network interface" --title "Static IP N
 In the next section, you can choose to use your current network settings (DHCP) or to manually edit them." $r $c
 
 # Ask if the user wannts to use DHCP settings as their static IP
-if (whiptail --title "Static IP Address" --yesno "Do you want to use your current network settings as a static address?
+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
@@ -90,7 +102,7 @@ else
 				if [[ $? = 0 ]];then
 						echo "Your static IPv4 gateway:    $IPv4gw"
 						# Give the user a chance to review their settings before moving on
-						if (whiptail --title "Static IP Address" --yesno "Are these settings correct?
+						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
@@ -125,6 +137,8 @@ else
 	done
 # End the if statement for DHCP vs. static
 fi
+# Set the static address
+set_static_ip
 
 # These are the commands to actually install the Pi-hole
 # This is pretty ugly, but it works to present a nice front-end
@@ -186,11 +200,11 @@ $percent
 Step $i of $n: ${echoes[$k]}
 XXX
 EOF
+
 # Execute the command in the background (hidden from the user, not actually a background process)
-#${echoes[$k]}
-${commands[${echoes[$k]}]}
-sleep 1
+${commands[${echoes[$k]}]} > /dev/null 2>&1
 done
+
 # As the loop is progressing, the output is sent to whiptail to be displayed to the user
 ) |
 whiptail --title "Opening your Pi-hole..." --gauge "Please wait..." $r $c 0

From 37f255d761be78b9682eb4f28991fb5e198caadd Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sat, 31 Oct 2015 09:15:57 -0500
Subject: [PATCH 04/20] save output to log file instead

Since the progress bar hides the output now.  Instead of destroying it,
send it to a log file instead so users who want to see it still can.
---
 automated install/basic-install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index ea513060..98935a87 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -10,6 +10,8 @@
 # curl -L install.pi-hole.net | bash
 
 ######## VARIABLES #########
+instalLogLoc=/etc/pihole/install.log
+
 # Get the screen size in case we need a full-screen message and so we can display a dialog that is sized nicely
 screenSize=$(stty -a | tr \; \\012 | egrep 'rows|columns' | cut '-d ' -f3)
 
@@ -202,7 +204,7 @@ XXX
 EOF
 
 # Execute the command in the background (hidden from the user, not actually a background process)
-${commands[${echoes[$k]}]} > /dev/null 2>&1
+${commands[${echoes[$k]}]} > $instalLogLoc 2>&1
 done
 
 # As the loop is progressing, the output is sent to whiptail to be displayed to the user

From a44591ca6be363d40d6c4c13f38021765ce2ce30 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sat, 31 Oct 2015 09:19:57 -0500
Subject: [PATCH 05/20] fix permission denied for log file

Just use a temporary file and then move it over once the install is
complete.
---
 automated install/basic-install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 98935a87..9e36448d 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -10,6 +10,7 @@
 # curl -L install.pi-hole.net | bash
 
 ######## VARIABLES #########
+tmpLog=/tmp/pihole-install.log
 instalLogLoc=/etc/pihole/install.log
 
 # Get the screen size in case we need a full-screen message and so we can display a dialog that is sized nicely
@@ -206,6 +207,7 @@ EOF
 # Execute the command in the background (hidden from the user, not actually a background process)
 ${commands[${echoes[$k]}]} > $instalLogLoc 2>&1
 done
+sudo mv $tmpLog $instalLogLoc$instalLogLoc
 
 # As the loop is progressing, the output is sent to whiptail to be displayed to the user
 ) |

From f37990351e7f9c5e47072450bcabb1dfca099cae Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sat, 31 Oct 2015 09:21:19 -0500
Subject: [PATCH 06/20] dumb mistake

fixed the variable name
---
 automated install/basic-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 9e36448d..f39009b5 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -205,7 +205,7 @@ XXX
 EOF
 
 # Execute the command in the background (hidden from the user, not actually a background process)
-${commands[${echoes[$k]}]} > $instalLogLoc 2>&1
+${commands[${echoes[$k]}]} > $tmpLog 2>&1
 done
 sudo mv $tmpLog $instalLogLoc$instalLogLoc
 

From 6d989f9160c451e56f64c37728ccf3b18d941f24 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sun, 1 Nov 2015 12:54:19 -0600
Subject: [PATCH 07/20] overwrite html folder

If the files already exist, the installer stalls out because it asks if
you want to replace the existing files.  the -o option forces an
overwrite.
---
 automated install/basic-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index f39009b5..0db4c025 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -168,7 +168,7 @@ commands["Enabling PHP"]="sudo lighty-enable-mod fastcgi fastcgi-php"; echoes+=(
 commands["Making a directory for the Web interface"]="sudo mkdir /var/www/html/pihole"; echoes+=( "Making a directory for the Web interface" )
 commands["Installing a blank HTML page to take place of ads"]="sudo curl -o /var/www/html/pihole/index.html https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html"; echoes+=( "Installing a blank HTML page to take place of ads" )
 commands["Downloading the Pi-hole dashboard"]="sudo wget https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip"; echoes+=( "Downloading the Pi-hole dashboard" )
-commands["Unpacking the dashboard"]="sudo unzip /var/www/master.zip -d /var/www/html/"; echoes+=( "Unpacking the dashboard" )
+commands["Unpacking the dashboard"]="sudo unzip -o /var/www/master.zip -d /var/www/html/"; echoes+=( "Unpacking the dashboard" )
 commands["Renaming the dashboard"]="sudo mv /var/www/html/AdminLTE-master /var/www/html/admin"; echoes+=( "Renaming the dashboard" )
 commands["Cleaning up the dashboard temp files"]="sudo rm /var/www/master.zip 2>/dev/null"; echoes+=( "Cleaning up the dashboard temp files" )
 commands["Creating a log file for the Pi-hole"]="sudo touch /var/log/pihole.log"; echoes+=( "Creating a log file for the Pi-hole" )

From 1482b9563c594e5b9ee3a6c08264f816fc5644c5 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sun, 1 Nov 2015 13:00:55 -0600
Subject: [PATCH 08/20] does gravity use static IP?

The changes to the gravity script check for a temp file containing the
static address set during the install.  I need to verify it works so I
have to change the URL.  I will change it back before merging with
master.
---
 automated install/basic-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 0db4c025..79d64099 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -174,7 +174,7 @@ commands["Cleaning up the dashboard temp files"]="sudo rm /var/www/master.zip 2>
 commands["Creating a log file for the Pi-hole"]="sudo touch /var/log/pihole.log"; echoes+=( "Creating a log file for the Pi-hole" )
 commands["chmodding the log file"]="sudo chmod 644 /var/log/pihole.log"; echoes+=( "chmodding the log file" )
 commands["chowning the log file so stats can be displayed"]="sudo chown dnsmasq:root /var/log/pihole.log"; echoes+=( "chowning the log file so stats can be displayed" )
-commands["Initating sub-space transport of gravity"]="sudo curl -o /usr/local/bin/gravity.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/gravity.sh"; echoes+=( "Initating sub-space transport of gravity" )
+commands["Initating sub-space transport of gravity"]="sudo curl -o /usr/local/bin/gravity.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/installation/gravity.sh"; echoes+=( "Initating sub-space transport of gravity" )
 commands["Initating sub-space transport of chronometer"]="sudo curl -o /usr/local/bin/chronometer.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh"; echoes+=( "Initating sub-space transport of chronometer" )
 commands["chmodding gravity"]="sudo chmod 755 /usr/local/bin/gravity.sh"; echoes+=( "chmodding gravity" )
 commands["chmodding the chronometer"]="sudo chmod 755 /usr/local/bin/chronometer.sh"; echoes+=( "chmodding the chronometer" )

From fb3fde3d19a1a5d44c1df0b480fb7209e239f2f9 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Fri, 6 Nov 2015 17:45:00 -0600
Subject: [PATCH 09/20] testing with no reboot

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

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 79d64099..68fe9fc1 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -179,7 +179,7 @@ commands["Initating sub-space transport of chronometer"]="sudo curl -o /usr/loca
 commands["chmodding gravity"]="sudo chmod 755 /usr/local/bin/gravity.sh"; echoes+=( "chmodding gravity" )
 commands["chmodding the chronometer"]="sudo chmod 755 /usr/local/bin/chronometer.sh"; echoes+=( "chmodding the chronometer" )
 commands["Entering the event horizion"]="sudo /usr/local/bin/gravity.sh"; echoes+=( "Entering the event horizion" )
-commands["Rebooting"]="sudo reboot"; echoes+=( "Rebooting" )
+commands["Rebooting"]="sudo service networking restart"; echoes+=( "Restarting networking..." )
 
 # Everything in the parentheses is part of displaying the progress bar
 (

From eec0a31216287b1b81172e3287ddfa788f153678 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sat, 7 Nov 2015 09:43:04 -0600
Subject: [PATCH 10/20] trying text output

I commented out the whiptail dialog at the end in place of text so you
can see what is going on.  I also install the crontab.
---
 automated install/basic-install.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 68fe9fc1..9fdd055f 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -24,7 +24,6 @@ columns=$(stty -a | tr \; \\012 | egrep 'columns' | cut -d' ' -f3)
 r=$(( rows / 2 ))
 c=$(( columns / 2 ))
 
-# Get the current network settings
 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}')
@@ -164,6 +163,8 @@ commands["Backing up the lighttpd config file"]="sudo mv /etc/lighttpd/lighttpd.
 commands["Backing up the default Web page"]="sudo mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig"; echoes+=( "Backing up the default Web page" )
 commands["Installing the dnsmasq config file"]="sudo curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf"; echoes+=( "Installing the dnsmasq config file" )
 commands["Installing the lighttpd config file"]="sudo curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf"; echoes+=( "Installing the lighttpd config file" )
+commands["Initating auto-pilot"]="sudo mv /etc/crontab /etc/crontab.orig"; echoes+=( "Initiating auto-pilot" )
+commands["Engaging auto-pilot"]="curl -o /etc/crontab https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/pihole.cron"; echoes+=( "Engaging auto-pilot" )
 commands["Enabling PHP"]="sudo lighty-enable-mod fastcgi fastcgi-php"; echoes+=( "Enabling PHP" )
 commands["Making a directory for the Web interface"]="sudo mkdir /var/www/html/pihole"; echoes+=( "Making a directory for the Web interface" )
 commands["Installing a blank HTML page to take place of ads"]="sudo curl -o /var/www/html/pihole/index.html https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html"; echoes+=( "Installing a blank HTML page to take place of ads" )
@@ -182,7 +183,7 @@ commands["Entering the event horizion"]="sudo /usr/local/bin/gravity.sh"; echoes
 commands["Rebooting"]="sudo service networking restart"; echoes+=( "Restarting networking..." )
 
 # Everything in the parentheses is part of displaying the progress bar
-(
+#(
 # Get total number of commands to be run from the array
 n=${#commands[*]};
 # Set counter to increase every time a loop completes
@@ -205,10 +206,10 @@ XXX
 EOF
 
 # Execute the command in the background (hidden from the user, not actually a background process)
-${commands[${echoes[$k]}]} > $tmpLog 2>&1
+${commands[${echoes[$k]}]} | tee $tmpLog
+clear
 done
 sudo mv $tmpLog $instalLogLoc$instalLogLoc
 
 # As the loop is progressing, the output is sent to whiptail to be displayed to the user
-) |
-whiptail --title "Opening your Pi-hole..." --gauge "Please wait..." $r $c 0
+#) |whiptail --title "Opening your Pi-hole..." --gauge "Please wait..." $r $c 0

From 8df376860cdd6ec5a5382aed5181a56cc0311a40 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sat, 7 Nov 2015 12:07:50 -0600
Subject: [PATCH 11/20] simple function to run install commands

The arrays were cool, but I think this just works easier.
---
 automated install/basic-install.sh | 115 +++++++++++------------------
 1 file changed, 44 insertions(+), 71 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 9fdd055f..938cc31f 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -60,6 +60,44 @@ static routers=$IPv4gw
 static domain_name_servers=$IPv4gw" | sudo tee -a $dhcpcdFile >/dev/null
 }
 
+installPihole()
+{
+sudo apt-get update
+sudo apt-get -y upgrade
+sudo apt-get -y install dnsutils bc toilet
+sudo apt-get -y install dnsmasq
+sudo apt-get -y install lighttpd php5-common php5-cgi php5
+sudo mkdir /var/www/html
+sudo chown www-data:www-data /var/www/html
+sudo chmod 775 /var/www/html
+sudo usermod -a -G www-data pi
+sudo service dnsmasq stop
+sudo service lighttpd stop
+sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
+sudo mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
+sudo mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
+sudo curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf
+sudo curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf
+sudo mv /etc/crontab /etc/crontab.orig
+sudo curl -o /etc/crontab https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/pihole.cron
+sudo lighty-enable-mod fastcgi fastcgi-php
+sudo mkdir /var/www/html/pihole
+sudo curl -o /var/www/html/pihole/index.html https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html
+sudo wget https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip
+sudo unzip -o /var/www/master.zip -d /var/www/html/
+sudo mv /var/www/html/AdminLTE-master /var/www/html/admin
+sudo rm /var/www/master.zip 2>/dev/null
+sudo touch /var/log/pihole.log
+sudo chmod 644 /var/log/pihole.log
+sudo chown dnsmasq:root /var/log/pihole.log
+sudo curl -o /usr/local/bin/gravity.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/installation/gravity.sh
+sudo curl -o /usr/local/bin/chronometer.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh
+sudo chmod 755 /usr/local/bin/gravity.sh
+sudo chmod 755 /usr/local/bin/chronometer.sh
+sudo /usr/local/bin/gravity.sh
+sudo service networking restart
+}
+
 ######## SCRIPT ############
 # Just back up the original Pi-hole right away since it won't take long and it gets it out of the way
 backupLegacyPihole
@@ -139,77 +177,12 @@ else
 	done
 # End the if statement for DHCP vs. static
 fi
+
 # Set the static address
 set_static_ip
 
-# These are the commands to actually install the Pi-hole
-# This is pretty ugly, but it works to present a nice front-end
-# http://stackoverflow.com/questions/29161323/how-to-keep-associative-array-order-in-bash
-# Maybe it would be better to just show the command output instead of the progress bar
-declare -A commands;      declare -a echoes;
-commands["Updating"]="sudo apt-get update"; echoes+=( "Updating" )
-commands["Upgrading"]="sudo apt-get -y upgrade"; echoes+=( "Upgrading" )
-commands["Installing chronomoter tools"]="sudo apt-get -y install dnsutils bc toilet"; echoes+=( "Installing chronomoter tools" )
-commands["Installing a DNS server"]="sudo apt-get -y install dnsmasq"; echoes+=( "Installing a DNS server" )
-commands["Instaling a Web server and PHP"]="sudo apt-get -y install lighttpd php5-common php5-cgi php5"; echoes+=( "Instaling a Web server and PHP" )
-commands["Making an HTML folder"]="sudo mkdir /var/www/html"; echoes+=( "Making an HTML folder" )
-commands["chowning the Web server"]="sudo chown www-data:www-data /var/www/html"; echoes+=( "chowning the Web server" )
-commands["chmodding the Web server"]="sudo chmod 775 /var/www/html"; echoes+=( "chmodding the Web server" )
-commands["Giving pi access to the Web server"]="sudo usermod -a -G www-data pi"; echoes+=( "Giving pi access to the Web server" )
-commands["Stopping dnsmasq to modify it"]="sudo service dnsmasq stop"; echoes+=( "Stopping dnsmasq to modify it" )
-commands["Stopping lighttpd to modify it"]="sudo service lighttpd stop"; echoes+=( "Stopping lighttpd to modify it" )
-commands["Backing up the dnsmasq config file"]="sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig"; echoes+=( "Backing up the dnsmasq config file" )
-commands["Backing up the lighttpd config file"]="sudo mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig"; echoes+=( "Backing up the lighttpd config file" )
-commands["Backing up the default Web page"]="sudo mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig"; echoes+=( "Backing up the default Web page" )
-commands["Installing the dnsmasq config file"]="sudo curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf"; echoes+=( "Installing the dnsmasq config file" )
-commands["Installing the lighttpd config file"]="sudo curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf"; echoes+=( "Installing the lighttpd config file" )
-commands["Initating auto-pilot"]="sudo mv /etc/crontab /etc/crontab.orig"; echoes+=( "Initiating auto-pilot" )
-commands["Engaging auto-pilot"]="curl -o /etc/crontab https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/pihole.cron"; echoes+=( "Engaging auto-pilot" )
-commands["Enabling PHP"]="sudo lighty-enable-mod fastcgi fastcgi-php"; echoes+=( "Enabling PHP" )
-commands["Making a directory for the Web interface"]="sudo mkdir /var/www/html/pihole"; echoes+=( "Making a directory for the Web interface" )
-commands["Installing a blank HTML page to take place of ads"]="sudo curl -o /var/www/html/pihole/index.html https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/index.html"; echoes+=( "Installing a blank HTML page to take place of ads" )
-commands["Downloading the Pi-hole dashboard"]="sudo wget https://github.com/jacobsalmela/AdminLTE/archive/master.zip -O /var/www/master.zip"; echoes+=( "Downloading the Pi-hole dashboard" )
-commands["Unpacking the dashboard"]="sudo unzip -o /var/www/master.zip -d /var/www/html/"; echoes+=( "Unpacking the dashboard" )
-commands["Renaming the dashboard"]="sudo mv /var/www/html/AdminLTE-master /var/www/html/admin"; echoes+=( "Renaming the dashboard" )
-commands["Cleaning up the dashboard temp files"]="sudo rm /var/www/master.zip 2>/dev/null"; echoes+=( "Cleaning up the dashboard temp files" )
-commands["Creating a log file for the Pi-hole"]="sudo touch /var/log/pihole.log"; echoes+=( "Creating a log file for the Pi-hole" )
-commands["chmodding the log file"]="sudo chmod 644 /var/log/pihole.log"; echoes+=( "chmodding the log file" )
-commands["chowning the log file so stats can be displayed"]="sudo chown dnsmasq:root /var/log/pihole.log"; echoes+=( "chowning the log file so stats can be displayed" )
-commands["Initating sub-space transport of gravity"]="sudo curl -o /usr/local/bin/gravity.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/installation/gravity.sh"; echoes+=( "Initating sub-space transport of gravity" )
-commands["Initating sub-space transport of chronometer"]="sudo curl -o /usr/local/bin/chronometer.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/Scripts/chronometer.sh"; echoes+=( "Initating sub-space transport of chronometer" )
-commands["chmodding gravity"]="sudo chmod 755 /usr/local/bin/gravity.sh"; echoes+=( "chmodding gravity" )
-commands["chmodding the chronometer"]="sudo chmod 755 /usr/local/bin/chronometer.sh"; echoes+=( "chmodding the chronometer" )
-commands["Entering the event horizion"]="sudo /usr/local/bin/gravity.sh"; echoes+=( "Entering the event horizion" )
-commands["Rebooting"]="sudo service networking restart"; echoes+=( "Restarting networking..." )
-
-# Everything in the parentheses is part of displaying the progress bar
-#(
-# Get total number of commands to be run from the array
-n=${#commands[*]};
-# Set counter to increase every time a loop completes
-i=0
-
-# For each item in the array
-for k in "${!echoes[@]}"
-do
-
-# Calculate the overall progress
-percent=$(( 100*(++i)/n ))
-
-# Update dialog box using the value of each key in the array
-# Show the percentage and the echo messages from the array
-cat <<EOF
-XXX
-$percent
-Step $i of $n: ${echoes[$k]}
-XXX
-EOF
-
-# Execute the command in the background (hidden from the user, not actually a background process)
-${commands[${echoes[$k]}]} | tee $tmpLog
-clear
-done
-sudo mv $tmpLog $instalLogLoc$instalLogLoc
-
-# As the loop is progressing, the output is sent to whiptail to be displayed to the user
-#) |whiptail --title "Opening your Pi-hole..." --gauge "Please wait..." $r $c 0
+# Install and log everything to a file
+installPihole | tee $tmpLog
+
+# Move the log file into /etc/pihole for storage
+sudo mv $tmpLog $instalLogLoc

From 8ac8aa72ce9fc6d1f86846dc15417dfbd358cc12 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sat, 7 Nov 2015 12:35:08 -0600
Subject: [PATCH 12/20] Closing dialog

Also starting the Pi-hole and restarting networking.
---
 automated install/basic-install.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 938cc31f..34a5d24c 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -186,3 +186,12 @@ installPihole | tee $tmpLog
 
 # Move the log file into /etc/pihole for storage
 sudo mv $tmpLog $instalLogLoc
+
+whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Configure your devices to use the Pi-hole as their DNS server using this IP: $IPv4addr.
+
+The networking service will restart after you close this dialog.  If you are using SSH, you may need to reconnect." $r $c
+
+# Start the services and restart networking
+sudo service dnsmasq start
+sudo service lighttpd start
+sudo ifdown eth0;sudo ifup eth0

From 46b4000e75882e339f5b80b4f509aaaf32daba4a Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sat, 7 Nov 2015 13:09:23 -0600
Subject: [PATCH 13/20] reboot works better

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

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 34a5d24c..83361cb4 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -189,9 +189,9 @@ 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.
 
-The networking service will restart after you close this dialog.  If you are using SSH, you may need to reconnect." $r $c
+Your Pi will restart when you close this dialog.  If you are using SSH, reconnect using the IP address above.
 
-# Start the services and restart networking
-sudo service dnsmasq start
-sudo service lighttpd start
-sudo ifdown eth0;sudo ifup eth0
+The install log is in /etc/phole." $r $c
+
+
+sudo reboot

From 76c217d9cc4ad1952d0f02f63452c4084a4b9384 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Sun, 8 Nov 2015 17:21:02 -0600
Subject: [PATCH 14/20] moving to functions

Also download the whitelist script.  Ask for donations for IPv6 support.
---
 automated install/basic-install.sh | 210 ++++++++++++++++++-----------
 1 file changed, 135 insertions(+), 75 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 83361cb4..73e7f1fb 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -29,9 +29,10 @@ IPv4mask=$(ifconfig | awk -F':' '/inet addr/ && !/127.0.0.1/ {print $4}')
 IPv4gw=$(ip route show | awk '/default\ via/ {print $3}')
 
 # IPv6 support to be added later
-#IPv6addr=$(ip addr show | awk '/scope\ global/ && /ff:fe/ {print $2}' | cut -d'/' -f1)
+#IPv6eui64=$(ip addr show | awk '/scope\ global/ && /ff:fe/ {print $2}' | cut -d'/' -f1)
+#IPv6linkLocal=$(ip addr show | awk '/inet/ && /scope\ link/ && /fe80/ {print $2}' | cut -d'/' -f1)
 
-ethernetDevice="eth0"
+availableInterfaces=$(ip link show | awk -F' ' '/[0-9]: [a-z]/ {print $2}' | grep -v "lo" | cut -d':' -f1)
 dhcpcdFile=/etc/dhcpcd.conf
 
 ####### FUCNTIONS ##########
@@ -51,7 +52,113 @@ else
 fi
 }
 
-set_static_ip()
+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
+
+# 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
+}
+
+use4andor6()
+{
+# Let use select IPv4 and/or IPv6
+cmd=(whiptail --separate-output --checklist "Select Protocols" $r $c 2)
+options=(IPv4 "Block ads over IPv4" on
+         IPv6 "Block ads over IPv4" off)
+choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
+clear
+for choice in $choices
+do
+    case $choice in
+        IPv4)
+            echo "IPv4 selected."
+			useIPv4=true
+            ;;
+        IPv6)
+            echo "IPv6 selected."
+			useIPv6=true
+            ;;
+    esac
+done
+}
+
+
+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
+								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.
+
+	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 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
+			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
+					# 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
+				# Cancelling gateway settings window
+				ipSettingsCorrect=False
+				echo "User canceled."
+				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."
+		exit
+	fi
+done
+# End the if statement for DHCP vs. static
+fi
+}
+
+
+setStaticIPv4()
 {
 # Append these lines to /etc/dhcpcd.conf to enable a static IP
 echo "interface $ethernetDevice
@@ -76,6 +183,7 @@ sudo service lighttpd stop
 sudo mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
 sudo mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
 sudo mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
+sudo mv /etc/crontab /etc/crontab.orig
 sudo curl -o /etc/dnsmasq.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dnsmasq.conf
 sudo curl -o /etc/lighttpd/lighttpd.conf https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/lighttpd.conf
 sudo mv /etc/crontab /etc/crontab.orig
@@ -92,94 +200,46 @@ 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/installation/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 chmod 755 /usr/local/bin/gravity.sh
 sudo chmod 755 /usr/local/bin/chronometer.sh
+sudo chmod 755 /usr/local/bin/whitelist.sh
 sudo /usr/local/bin/gravity.sh
 sudo service networking restart
 }
 
 ######## SCRIPT ############
+# Start the installer
+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
 
-# 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
-
-# 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.
+# Let the user decide if they want to block ads over IPv4 and/or IPv6
+use4andor6
 
-In the next section, you can choose to use your current network settings (DHCP) or to manually edit them." $r $c
-
-# 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
-							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.
+# Decide is IPv4 will be used
+if [[ "$useIPv4" = true ]];then
+	echo "Using IPv4"
+	getStaticIPv4Settings
+	setStaticIPv4
+else
+	echo "IPv4 will NOT be used."
+fi
 
-If you are worried, either manually set the address, or modify the DHCP reservation pool so it does not include the IP you want.
+# Decide is IPv6 will be used
+if [[ "$useIPv6" = true ]];then
+	whiptail --msgbox --backtitle "Coming soon..." --title "IPv6 not yet supported" "I need your help.  Consider donating at:
 
-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
+															http://pi-hole.net/donate" $r $c
+	echo "Using IPv6"
 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 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
-				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
-							# 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
-					# Cancelling gateway settings window
-					ipSettingsCorrect=False
-					echo "User canceled."
-					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."
-		exit
-	fi
-	done
-# End the if statement for DHCP vs. static
+	whiptail --msgbox --backtitle "Coming soon..." --title "IPv6 not yet supported" "I need your help.  Consider donating at:
+
+															http://pi-hole.net/donate" $r $c
+	echo "IPv6 will NOT be used."
 fi
 
-# Set the static address
-set_static_ip
 
 # Install and log everything to a file
 installPihole | tee $tmpLog

From ad91eb44fbac32f0e1efa41b42e669168293d076 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Mon, 9 Nov 2015 18:33:32 -0600
Subject: [PATCH 15/20] choose an interface

also fixing ipv6 logic
---
 automated install/basic-install.sh | 60 +++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 9 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 73e7f1fb..d171bf80 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -63,6 +63,40 @@ whiptail --msgbox --backtitle "Initating network interface" --title "Static IP N
 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=()
+while read -r line
+do
+interfacesArray+=("$line" "available" "OFF")
+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
+	# case $chooseInterfaceOptions in
+	# 	eth0)
+	# 		echo "Ethernet"
+	# 		useIPv4=true
+	# 		;;
+	# 	IPv6)
+	# 		echo "IPv6 selected."
+	# 		useIPv6=true
+	# 		;;
+	# esac
+	# chosenInterface="$desiredInterface"
+	# echo "$desiredInterface"
+	echo "Chosen: $piholeInterface"
+done
+
+
+}
+
 use4andor6()
 {
 # Let use select IPv4 and/or IPv6
@@ -79,13 +113,18 @@ do
 			useIPv4=true
             ;;
         IPv6)
-            echo "IPv6 selected."
+			echo "IPv6 selected."
 			useIPv6=true
             ;;
     esac
 done
 }
 
+useIPv6dialog()
+{
+whiptail --msgbox --backtitle "Coming soon..." --title "IPv6 not yet supported" "I need your help for IPv6.  Consider donating at: http://pi-hole.net/donate" $r $c
+}
+
 
 getStaticIPv4Settings()
 {
@@ -215,6 +254,8 @@ 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
 
+chooseInterface
+
 # Let the user decide if they want to block ads over IPv4 and/or IPv6
 use4andor6
 
@@ -224,23 +265,24 @@ if [[ "$useIPv4" = true ]];then
 	getStaticIPv4Settings
 	setStaticIPv4
 else
+	useIPv4=false
 	echo "IPv4 will NOT be used."
 fi
 
 # Decide is IPv6 will be used
 if [[ "$useIPv6" = true ]];then
-	whiptail --msgbox --backtitle "Coming soon..." --title "IPv6 not yet supported" "I need your help.  Consider donating at:
-
-															http://pi-hole.net/donate" $r $c
-	echo "Using IPv6"
+	# If only IPv6 is selected, exit because it is not supported yet
+	if [[ "$useIPv6" = true ]] && [[ "$useIPv4" = false ]];then
+		useIPv6dialog
+		exit
+	else
+		useIPv6dialog
+	fi
 else
-	whiptail --msgbox --backtitle "Coming soon..." --title "IPv6 not yet supported" "I need your help.  Consider donating at:
-
-															http://pi-hole.net/donate" $r $c
+	useIPv6=false
 	echo "IPv6 will NOT be used."
 fi
 
-
 # Install and log everything to a file
 installPihole | tee $tmpLog
 

From 0936e394d48f12fb0ee5cf19e33467c9c2697785 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Tue, 10 Nov 2015 08:12:24 -0600
Subject: [PATCH 16/20] reboot only if new IP was set

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

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index d171bf80..2963dfcb 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -200,7 +200,7 @@ fi
 setStaticIPv4()
 {
 # Append these lines to /etc/dhcpcd.conf to enable a static IP
-echo "interface $ethernetDevice
+echo "interface $piholeInterface
 static ip_address=$IPv4addr/24
 static routers=$IPv4gw
 static domain_name_servers=$IPv4gw" | sudo tee -a $dhcpcdFile >/dev/null
@@ -295,5 +295,12 @@ Your Pi will restart when you close this dialog.  If you are using SSH, reconnec
 
 The install log is in /etc/phole." $r $c
 
-
-sudo reboot
+# If the current IP address equals the desired address, no change is needed
+if [[ $IPv4addr = "$(cat /tmp/piholeIP)" ]];then
+	# So just start the services
+	echo "sudo service dnsmasq start"
+	echo "sudo service lighttpd start"
+else
+	# Restart to apply the new static IP address
+	echo "sudo reboot"
+fi

From 814873c6430054211a098c88e0b9b05230d2e38b Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Tue, 10 Nov 2015 17:28:05 -0600
Subject: [PATCH 17/20] reboot logic

---
 automated install/basic-install.sh | 41 +++++++++++-------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 2963dfcb..a5cef6b6 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -69,7 +69,7 @@ chooseInterface()
 interfacesArray=()
 while read -r line
 do
-interfacesArray+=("$line" "available" "OFF")
+interfacesArray+=("$line" "available" "ON")
 done <<< "$availableInterfaces"
 
 # Find out how many interfaces are available to choose from
@@ -79,22 +79,8 @@ chooseInterfaceOptions=$("${chooseInterfaceCmd[@]}" "${interfacesArray[@]}" 2>&1
 for desiredInterface in $chooseInterfaceOptions
 do
 	piholeInterface=$desiredInterface
-	# case $chooseInterfaceOptions in
-	# 	eth0)
-	# 		echo "Ethernet"
-	# 		useIPv4=true
-	# 		;;
-	# 	IPv6)
-	# 		echo "IPv6 selected."
-	# 		useIPv6=true
-	# 		;;
-	# esac
-	# chosenInterface="$desiredInterface"
-	# echo "$desiredInterface"
-	echo "Chosen: $piholeInterface"
+	echo "Using interface: $piholeInterface"
 done
-
-
 }
 
 use4andor6()
@@ -125,7 +111,6 @@ useIPv6dialog()
 whiptail --msgbox --backtitle "Coming soon..." --title "IPv6 not yet supported" "I need your help for IPv6.  Consider donating at: http://pi-hole.net/donate" $r $c
 }
 
-
 getStaticIPv4Settings()
 {
 # Ask if the user wannts to use DHCP settings as their static IP
@@ -142,6 +127,8 @@ 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
@@ -240,6 +227,7 @@ sudo chown dnsmasq:root /var/log/pihole.log
 sudo curl -o /usr/local/bin/gravity.sh https://raw.githubusercontent.com/jacobsalmela/pi-hole/installation/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
@@ -254,6 +242,7 @@ 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
@@ -280,7 +269,7 @@ if [[ "$useIPv6" = true ]];then
 	fi
 else
 	useIPv6=false
-	echo "IPv6 will NOT be used."
+	echo "IPv6 will NOT be used.  Consider a donation at pi-hole.net/donate"
 fi
 
 # Install and log everything to a file
@@ -291,16 +280,16 @@ 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.
 
-Your Pi will restart when you close this dialog.  If you are using SSH, reconnect using the IP address above.
+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.
 
 The install log is in /etc/phole." $r $c
 
-# If the current IP address equals the desired address, no change is needed
-if [[ $IPv4addr = "$(cat /tmp/piholeIP)" ]];then
-	# So just start the services
-	echo "sudo service dnsmasq start"
-	echo "sudo service lighttpd start"
-else
+# If a custom address was set, restart
+if [[ "$rebootNeeded" = true ]];then
 	# Restart to apply the new static IP address
-	echo "sudo reboot"
+	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

From dee3df4e1195c1ae45c61240640e14bc04548845 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Tue, 10 Nov 2015 17:28:53 -0600
Subject: [PATCH 18/20] download master gravity

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

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index a5cef6b6..85f79e59 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -224,7 +224,7 @@ 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/installation/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

From 0cb20fc080afdc95dcf6484cd66d2bfeb8c329e3 Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Tue, 10 Nov 2015 17:34:25 -0600
Subject: [PATCH 19/20] typo

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

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 85f79e59..2a2b88d5 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -282,7 +282,7 @@ whiptail --msgbox --backtitle "Make it so." --title "Installation Complete!" "Co
 
 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.
 
-The install log is in /etc/phole." $r $c
+The install log is in /etc/pihole." $r $c
 
 # If a custom address was set, restart
 if [[ "$rebootNeeded" = true ]];then

From d0d165ad165e1ba873df73bd97691de7c9bf7afa Mon Sep 17 00:00:00 2001
From: Jacob Salmela <jacobsalmela@users.noreply.github.com>
Date: Tue, 10 Nov 2015 21:27:53 -0600
Subject: [PATCH 20/20] chmod the log flusher

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

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 2a2b88d5..f0a7d139 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -231,8 +231,8 @@ sudo curl -o /usr/local/bin/piholeLogFlush.sh https://raw.githubusercontent.com/
 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 service networking restart
 }
 
 ######## SCRIPT ############