Fix merge conflicts

README.md

@@ -1,7 +1,7 @@
 # Automated Install
-##### Designed For Raspberry Pi A+, B, B+, 2, and Zero (with an Ethernet/Wi-Fi adapter)
+##### Designed For Raspberry Pi A+, B, B+, 2, Zero (with an Ethernet adapter), and also works on most Debian based distros!
 
-1. Install Raspbian 
+1. Install Raspbian on Raspberry Pi variants or a Debian based distribution on other hardware or virtual machines
 2. Run the command below
 
 ### ```curl -L https://install.pi-hole.net | bash```

adlists.default

@@ -31,8 +31,8 @@ http://hosts-file.net/ad_servers.txt
 # ADZHOSTS list. Has been known to block legitimate domains
 #http://optimate.dl.sourceforge.net/project/adzhosts/HOSTS.txt
 
-# Windows 10 telemetry list - warning this one may block windows update
+# Windows 10 telemetry list
-#https://raw.githubusercontent.com/crazy-max/HostsWindowsBlocker/master/hosts.txt
+#https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/hostsBlockWindowsSpy.txt
 
 # Securemecca.com list - Also blocks "adult" sites (pornography/gambling etc)
 #http://securemecca.com/Downloads/hosts.txt
@@ -40,6 +40,9 @@ http://hosts-file.net/ad_servers.txt
 # Quidsup's tracker list
 https://raw.githubusercontent.com/quidsup/notrack/master/trackers.txt
 
+# Block the BBC News website Breaking News banner
+#https://raw.githubusercontent.com/BreakingTheNews/BreakingTheNews.github.io/master/hosts
+
 
 # Untested Lists:
 #https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt

advanced/Scripts/chronometer.sh

@@ -88,7 +88,8 @@ function normalChrono(){
 		echo "        $(ifconfig eth0 | awk '/inet addr/ {print $2}' | cut -d':' -f2)"
 		echo ""
 		uptime | cut -d' ' -f11-
-		uptime -p
+		#uptime -p	#Doesn't work on all versions of uptime
+		uptime | awk -F'( |,|:)+' '{if ($7=="min") m=$6; else {if ($7~/^day/) {d=$6;h=$8;m=$9} else {h=$6;m=$7}}} {print d+0,"days,",h+0,"hours,",m+0,"minutes."}'
 		echo "-------------------------------"
 		# Uncomment to continually read the log file and display the current domain being blocked
 		#tail -f /var/log/pihole.log | awk '/\/etc\/pihole\/gravity.list/ {if ($7 != "address" && $7 != "name" && $7 != "/etc/pihole/gravity.list") print $7; else;}'

automated install/basic-install.sh

@@ -658,6 +658,19 @@ setUser(){
 	fi
 }
 
+setPassword() {
+	# Password needed to authorize changes to lists from admin page
+	pass=$(whiptail --passwordbox "Please enter a password to secure your Pi-hole web interface." 10 50 3>&1 1>&2 2>&3)
+
+	if [ $? = 0 ]; then
+		# Entered password
+		echo $pass > /etc/pihole/password.txt
+	else
+		echo "::: Cancel selected, exiting...."
+		exit 1
+	fi
+}
+
 installPihole() {
 	# Install base files and web interface
 	checkForDependencies # done
@@ -708,6 +721,9 @@ use4andor6
 # Decide what upstream DNS Servers to use
 setDNS
 
+# Set the admin page password
+setPassword
+
 # Install and log everything to a file
 installPihole | tee $tmpLog