Remove extraneous whitespace from basic-install.sh

automated install/basic-install.sh

@@ -106,10 +106,10 @@ backupLegacyPihole() {
 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
@@ -119,7 +119,7 @@ chooseInterface() {
 	# Turn the available interfaces into an array so it can be used with a whiptail dialog
 	interfacesArray=()
 	firstloop=1
-	
+
 	while read -r line
 	do
 		mode="OFF"
@@ -129,12 +129,12 @@ chooseInterface() {
 		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
@@ -186,7 +186,7 @@ useIPv6dialog() {
 	# Show the IPv6 address used for blocking
 	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 touch /etc/pihole/.useIPv6
 }
 
@@ -271,13 +271,13 @@ installScripts() {
 	# Install the scripts from /etc/.pihole to their various locations
 	$SUDO echo ":::"
 	$SUDO echo -n "::: Installing scripts..."
-	$SUDO cp /etc/.pihole/gravity.sh /usr/local/bin/gravity.sh	
+	$SUDO cp /etc/.pihole/gravity.sh /usr/local/bin/gravity.sh
 	$SUDO cp /etc/.pihole/advanced/Scripts/chronometer.sh /usr/local/bin/chronometer.sh
-	$SUDO cp /etc/.pihole/advanced/Scripts/whitelist.sh /usr/local/bin/whitelist.sh 
-	$SUDO cp /etc/.pihole/advanced/Scripts/blacklist.sh /usr/local/bin/blacklist.sh 
-	$SUDO cp /etc/.pihole/advanced/Scripts/piholeLogFlush.sh /usr/local/bin/piholeLogFlush.sh 
-	$SUDO cp /etc/.pihole/advanced/Scripts/updateDashboard.sh /usr/local/bin/updateDashboard.sh 
-	$SUDO chmod 755 /usr/local/bin/{gravity,chronometer,whitelist,blacklist,piholeLogFlush,updateDashboard}.sh	
+	$SUDO cp /etc/.pihole/advanced/Scripts/whitelist.sh /usr/local/bin/whitelist.sh
+	$SUDO cp /etc/.pihole/advanced/Scripts/blacklist.sh /usr/local/bin/blacklist.sh
+	$SUDO cp /etc/.pihole/advanced/Scripts/piholeLogFlush.sh /usr/local/bin/piholeLogFlush.sh
+	$SUDO cp /etc/.pihole/advanced/Scripts/updateDashboard.sh /usr/local/bin/updateDashboard.sh
+	$SUDO chmod 755 /usr/local/bin/{gravity,chronometer,whitelist,blacklist,piholeLogFlush,updateDashboard}.sh
 	$SUDO echo " done."
 }
 
@@ -287,8 +287,8 @@ installConfigs() {
 	$SUDO echo -n "::: Installing configs..."
 	$SUDO mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
 	$SUDO mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.orig
-	$SUDO cp /etc/.pihole/advanced/dnsmasq.conf /etc/dnsmasq.conf 
-	$SUDO cp /etc/.pihole/advanced/lighttpd.conf /etc/lighttpd/lighttpd.conf 
+	$SUDO cp /etc/.pihole/advanced/dnsmasq.conf /etc/dnsmasq.conf
+	$SUDO cp /etc/.pihole/advanced/lighttpd.conf /etc/lighttpd/lighttpd.conf
 	$SUDO sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.conf
 	$SUDO echo " done."
 }
@@ -297,8 +297,8 @@ stopServices() {
 	# Stop dnsmasq and lighttpd
 	$SUDO echo ":::"
 	$SUDO echo -n "::: Stopping services..."
-	$SUDO service dnsmasq stop & spinner $! || true 
-	$SUDO service lighttpd stop & spinner $! || true 
+	$SUDO service dnsmasq stop & spinner $! || true
+	$SUDO service lighttpd stop & spinner $! || true
 	$SUDO echo " done."
 }
 
@@ -315,26 +315,26 @@ checkForDependencies() {
 	timestampAsDate=$(date -d @$timestamp "+%b %e")
 	today=$(date "+%b %e")
 
-	if [ ! "$today" == "$timestampAsDate" ]; then 		
+	if [ ! "$today" == "$timestampAsDate" ]; then
 	    #update package lists
 	    echo ":::"
 	    echo -n "::: apt-get update has not been run today. Running now..."
 	    $SUDO apt-get -qq update & spinner $!
 	    echo " done!"
-	  fi 		
-		echo ":::" 
+	  fi
+		echo ":::"
 		echo -n "::: Checking apt-get for upgraded packages...."
 		updatesToInstall=$(sudo apt-get -s -o Debug::NoLocking=true upgrade | grep -c ^Inst)
 		echo " done!"
 		echo ":::"
 		if [[ $updatesToInstall -eq "0" ]]; then
 			echo "::: Your pi is up to date! Continuing with pi-hole installation..."
-		else		 
+		else
 			echo "::: There are $updatesToInstall updates availible for your pi!"
-			echo "::: We recommend you run 'sudo apt-get upgrade' after installing Pi-Hole! "			
+			echo "::: We recommend you run 'sudo apt-get upgrade' after installing Pi-Hole! "
 			echo ":::"
 		fi
-    echo ":::" 
+    echo ":::"
     echo "::: Checking dependencies:"
 
 	dependencies=( dnsutils bc toilet figlet dnsmasq lighttpd php5-common php5-cgi php5 git curl unzip wget )
@@ -356,16 +356,16 @@ getGitFiles() {
 	# Setup git repos for base files and web admin
 	echo ":::"
 	echo "::: Checking for existing base files..."
-	if is_repo $piholeFilesDir; then				
-		make_repo $piholeFilesDir $piholeGitUrl        
+	if is_repo $piholeFilesDir; then
+		make_repo $piholeFilesDir $piholeGitUrl
 	else
-		update_repo $piholeFilesDir  		
+		update_repo $piholeFilesDir
 	fi
 
-	echo ":::"  
+	echo ":::"
 	echo "::: Checking for existing web interface..."
-	if is_repo $webInterfaceDir; then  		
-		make_repo $webInterfaceDir $webInterfaceGitUrl  		
+	if is_repo $webInterfaceDir; then
+		make_repo $webInterfaceDir $webInterfaceGitUrl
 	else
 		update_repo $webInterfaceDir
 	fi
@@ -410,7 +410,7 @@ CreateLogFile() {
 		$SUDO echo " done!"
 	else
 		$SUDO  echo " already exists!"
-	fi	
+	fi
 }
 
 installPiholeWeb() {
@@ -460,8 +460,8 @@ installPihole() {
 	$SUDO chmod 775 /var/www/html
 	$SUDO usermod -a -G www-data pi
 	$SUDO lighty-enable-mod fastcgi fastcgi-php > /dev/null
-	
-	getGitFiles	
+
+	getGitFiles
 	installScripts
 	installConfigs
 	#installWebAdmin
@@ -505,4 +505,4 @@ displayFinalMessage
 
 # Start services
 $SUDO service dnsmasq start
-$SUDO service lighttpd start
+$SUDO service lighttpd start