consistency

Just more cleanup

advanced/Scripts/blacklist.sh

@@ -47,7 +47,7 @@ domToRemoveList=()
 piholeIPfile=/etc/pihole/piholeIP
 piholeIPv6file=/etc/pihole/.useIPv6
 
-if [[ -f ${piholeIPfile} ]];then
+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})
 	#rm $piholeIPfile
@@ -61,22 +61,22 @@ fi
 modifyHost=false
 
 # After setting defaults, check if there's local overrides
-if [[ -r ${piholeDir}/pihole.conf ]];then
+if [[ -r ${piholeDir}/pihole.conf ]]; then
 	echo "::: Local calibration requested..."
 	. ${piholeDir}/pihole.conf
 fi
 
 
-if [[ -f ${piholeIPv6file} ]];then
+if [[ -f ${piholeIPv6file} ]]; then
 	# If the file exists, then the user previously chose to use IPv6 in the automated installer
 	piholeIPv6=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
 fi
 
 HandleOther() {
 	#check validity of domain
-	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/')
+	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
+	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
@@ -84,20 +84,20 @@ HandleOther() {
 
 PopBlacklistFile() {
 	#check blacklist file exists, and if not, create it
-	if [[ ! -f ${blacklist} ]];then
+	if [[ ! -f ${blacklist} ]]; then
 		touch ${blacklist}
 	fi
 	for dom in "${domList[@]}"; do
-	  if "$addmode"; then
+		if "${addmode}"; then
-	  	AddDomain "$dom"
+			AddDomain "${dom}"
 		else
-	    RemoveDomain "$dom"
+			RemoveDomain "${dom}"
 		fi
 	done
 }
 
 AddDomain() {
-#| sed 's/\./\\./g'
+	#| sed 's/\./\\./g'
 	bool=false
 	grep -Ex -q "$1" ${blacklist} || bool=true
 	if ${bool}; then
@@ -105,18 +105,17 @@ AddDomain() {
 		if ${verbose}; then
 			echo -n "::: Adding $1 to blacklist file..."
 		fi
-		echo "$1" >> ${blacklist}
+		echo "${1}" >> ${blacklist}
 		modifyHost=true
 		echo " done!"
 	else
 	if ${verbose}; then
-		echo "::: $1 already exists in $blacklist! No need to add"
+		echo "::: ${1} already exists in ${blacklist}! No need to add"
 		fi
 	fi
 }
 
 RemoveDomain() {
-
 	bool=false
 	grep -Ex -q "$1" ${blacklist} || bool=true
 	if ${bool}; then
@@ -127,7 +126,7 @@ RemoveDomain() {
 	else
 		#Domain is in the blacklist file, add to a temporary array
 		if ${verbose}; then
-    echo "::: Un-blacklisting $dom..."
+			echo "::: Un-blacklisting ${dom}..."
 		fi
 		domToRemoveList=("${domToRemoveList[@]}" $1)
 		modifyHost=true
@@ -137,12 +136,12 @@ RemoveDomain() {
 ModifyHostFile() {
 	if ${addmode}; then
 		#add domains to the hosts file
-	    if [[ -r ${blacklist} ]];then
+		if [[ -r ${blacklist} ]]; then
 			numberOf=$(cat ${blacklist} | sed '/^\s*$/d' | wc -l)
-        plural=; [[ "$numberOf" != "1" ]] && plural=s
+			plural=; [[ "${numberOf}" != "1" ]] && plural=s
 			echo ":::"
 			echo -n "::: Modifying HOSTS file to blacklist $numberOf domain${plural}..."
-	    	if [[ -n ${piholeIPv6} ]];then
+			if [[ -n ${piholeIPv6} ]]; then
 				cat ${blacklist} | awk -v ipv4addr="$piholeIP" -v ipv6addr="$piholeIPv6" '{sub(/\r$/,""); print ipv4addr" "$0"\n"ipv6addr" "$0}' >> ${adList}
 			else
 				cat ${blacklist} | awk -v ipv4addr="$piholeIP" '{sub(/\r$/,""); print ipv4addr" "$0}' >>${adList}
@@ -150,15 +149,14 @@ ModifyHostFile() {
 		fi
 	else
 		echo ":::"
-	  	for dom in "${domToRemoveList[@]}"
+		for dom in "${domToRemoveList[@]}"; do
-		do
 			#we need to remove the domains from the blacklist file and the host file
-			echo "::: $dom"
+			echo "::: ${dom}"
 			echo -n ":::    removing from HOSTS file..."
-	      	echo "$dom" | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /[^.]'{}'(?!.)/;' ${adList}
+			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 "${dom}" | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /'{}'(?!.)/;' ${blacklist}
 			echo " done!"
 		done
 	fi
@@ -193,17 +191,15 @@ DisplayBlist() {
 	verbose=false
 	echo -e " Displaying Gravity Affected Domains \n"
 	count=1
-	while IFS= read -r AD
+	while IFS= read -r AD; do
-	do
+		echo "${count}: ${AD}"
-		echo "${count}: $AD"
 		count=$((count+1))
-	done < "$blacklist"
+	done < "${blacklist}"
 }
 
 ###################################################
 
-for var in "$@"
+for var in "$@"; do
-do
 	case "$var" in
 		"-nr"| "--noreload"  ) reload=false;;
 		"-d" | "--delmode"   ) addmode=false;;