Merge Conflict resolution

README.md

@@ -1,5 +1,7 @@
 # Automated Install
 
+[![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=3011939)](https://www.bountysource.com/trackers/3011939-pi-hole-pi-hole?utm_source=3011939&utm_medium=shield&utm_campaign=TRACKER_BADGE)   
+
 Designed For Raspberry Pi A+, B, B+, 2, 3B, and Zero (with an Ethernet/Wi-Fi adapter)
 Works on most Debian and CentOS/RHEL based distributions!
 

advanced/Scripts/piholeDebug.sh

@@ -10,9 +10,6 @@
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 
-# Nate Brandeburg
-# nate@ubiquisoft.com
-# 3/24/2016
 
 ######## GLOBAL VARS ########
 DEBUG_LOG="/var/log/pihole_debug.log"
@@ -72,7 +69,7 @@ function distroCheck {
 	echo "######## Distribution Section #########" >> $DEBUG_LOG
 	echo "#######################################" >> $DEBUG_LOG
 	
-	TMP=$(cat /etc/*release/ || echo "Failed to find release")
+	TMP=$(cat /etc/*release || echo "Failed to find release")
 	echo "Distribution Version: $TMP" >> $DEBUG_LOG
 }
 	

automated install/basic-install.sh

@@ -67,7 +67,7 @@ if [ -x "$(command -v rpm)" ];then
 	PKG_INSTALL="$PKG_MANAGER install -y"
 	PKG_COUNT="$PKG_MANAGER check-update | grep -v ^Last | grep -c ^[a-zA-Z0-9]"
 	INSTALLER_DEPS=( iproute net-tools procps-ng newt )
-	PIHOLE_DEPS=( epel-release bind-utils bc dnsmasq lighttpd lighttpd-fastcgi php-common php-cli php git curl unzip wget findutils cronie sudo netcat )
+	PIHOLE_DEPS=( epel-release bind-utils bc dnsmasq lighttpd lighttpd-fastcgi php-common php-cli php git curl unzip wget findutils cronie sudo nmap-ncat )
 	LIGHTTPD_USER="lighttpd"
 	LIGHTTPD_GROUP="lighttpd"
 	LIGHTTPD_CFG="lighttpd.conf.fedora"
@@ -324,7 +324,7 @@ It is also possible to use a DHCP reservation, but if you are going to do that,
 
 setDHCPCD() {
 	# Append these lines to dhcpcd.conf to enable a static IP
-	echo "::: interface $piholeInterface
+	echo "## interface $piholeInterface
 	static ip_address=$IPv4addr
 	static routers=$IPv4gw
 	static domain_name_servers=$IPv4gw" | $SUDO tee -a /etc/dhcpcd.conf >/dev/null