From 61140348fef8552a61deb02c712959b43e7fb61c Mon Sep 17 00:00:00 2001
From: Adam Warner <awarner@croydon.parkeon.com>
Date: Tue, 1 Nov 2016 10:16:08 +0000
Subject: [PATCH] More tabs to spaces.

---
 advanced/Scripts/list.sh        |  57 +++----
 advanced/Scripts/piholeDebug.sh | 264 ++++++++++++++++----------------
 advanced/Scripts/setupLCD.sh    |  34 ++--
 advanced/Scripts/update.sh      | 140 ++++++++---------
 advanced/Scripts/version.sh     | 100 ++++++------
 5 files changed, 298 insertions(+), 297 deletions(-)

diff --git a/advanced/Scripts/list.sh b/advanced/Scripts/list.sh
index 24f6d055..35829721 100644
--- a/advanced/Scripts/list.sh
+++ b/advanced/Scripts/list.sh
@@ -26,14 +26,13 @@ listMain=""
 listAlt=""
 
 helpFunc() {
-
-    if [[ ${listMain} == ${whitelist} ]]; then
-        letter="w"
-        word="white"
-    else
-        letter="b"
-        word="black"
-    fi
+  if [[ ${listMain} == ${whitelist} ]]; then
+    letter="w"
+    word="white"
+  else
+    letter="b"
+    word="black"
+  fi
 
 	cat << EOM
 ::: Immediately ${word}lists one or more domains in the hosts file
@@ -100,21 +99,22 @@ AddDomain() {
 }
 
 RemoveDomain() {
-    list="$2"
+  list="$2"
 
-    bool=true
-    #Is it in the other list? Logic follows that if its whitelisted it should not be blacklisted and vice versa
-    grep -Ex -q "$1" ${list} > /dev/null 2>&1 || bool=false
-    if [[ "${bool}" == true ]]; then
-        # Remove it from the other one
-        echo "::: Removing $1 from $list..."
-        echo "$1" | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /'{}'(?!.)/;' ${list}
-        reload=true
-    else
-        if [[ "${verbose}" == true ]]; then
-            echo "::: ${1} does not exist in ${list}, no need to remove!"
-        fi
+  bool=true
+
+  #Is it in the other list? Logic follows that if its whitelisted it should not be blacklisted and vice versa
+  grep -Ex -q "$1" ${list} > /dev/null 2>&1 || bool=false
+  if [[ "${bool}" == true ]]; then
+    # Remove it from the other one
+    echo "::: Removing $1 from $list..."
+    echo "$1" | sed 's/\./\\./g' | xargs -I {} perl -i -ne'print unless /'{}'(?!.)/;' ${list}
+    reload=true
+  else
+    if [[ "${verbose}" == true ]]; then
+      echo "::: ${1} does not exist in ${list}, no need to remove!"
     fi
+  fi
 }
 
 Reload() {
@@ -123,11 +123,12 @@ Reload() {
 }
 
 Displaylist() {
-    if [[ ${listMain} == ${whitelist} ]]; then
-        string="gravity resistant domains"
-    else
-        string="domains caught in the sinkhole"
-    fi
+  if [[ ${listMain} == ${whitelist} ]]; then
+    string="gravity resistant domains"
+  else
+    string="domains caught in the sinkhole"
+  fi
+
 	verbose=false
 	echo -e " Displaying $string \n"
 	count=1
@@ -140,8 +141,8 @@ Displaylist() {
 
 for var in "$@"; do
 	case "${var}" in
-	    "-w" | "whitelist"   ) listMain="${whitelist}"; listAlt="${blacklist}";;
-	    "-b" | "blacklist"   ) listMain="${blacklist}"; listAlt="${whitelist}";;
+	  "-w" | "whitelist"   ) listMain="${whitelist}"; listAlt="${blacklist}";;
+	  "-b" | "blacklist"   ) listMain="${blacklist}"; listAlt="${whitelist}";;
 		"-nr"| "--noreload"  ) reload=false;;
 		"-d" | "--delmode"   ) addmode=false;;
 		"-f" | "--force"     ) force=true;;
diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh
index 6768a8ea..2fafa23a 100755
--- a/advanced/Scripts/piholeDebug.sh
+++ b/advanced/Scripts/piholeDebug.sh
@@ -82,12 +82,12 @@ header_write() {
 
 file_parse() {
     while read -r line; do
-		  if [ ! -z "${line}" ]; then
-			  [[ "${line}" =~ ^#.*$  || ! "${line}" ]] && continue
-				log_write "${line}"
-			fi
-		done < "${1}"
-		log_write ""
+      if [ ! -z "${line}" ]; then
+        [[ "${line}" =~ ^#.*$  || ! "${line}" ]] && continue
+        log_write "${line}"
+      fi
+    done < "${1}"
+    log_write ""
 }
 
 block_parse() {
@@ -114,15 +114,15 @@ version_check() {
   local error_found
   error_found=0
 
-	local pi_hole_ver="$(cd /etc/.pihole/ && git describe --tags --abbrev=0)" \
-	&& log_echo -r "Pi-hole: $pi_hole_ver" || (log_echo "Pi-hole git repository not detected." && error_found=1)
-	local admin_ver="$(cd /var/www/html/admin && git describe --tags --abbrev=0)" \
-	&& log_echo -r "WebUI: $admin_ver" || (log_echo "Pi-hole Admin Pages git repository not detected." && error_found=1)
-	local light_ver="$(lighttpd -v |& head -n1 | cut -d " " -f1)" \
-	&& log_echo -r "${light_ver}" || (log_echo "lighttpd not installed." && error_found=1)
-	local php_ver="$(php -v |& head -n1)" \
-	&& log_echo -r "${php_ver}" || (log_echo "PHP not installed." && error_found=1)
-	return "${error_found}"
+  local pi_hole_ver="$(cd /etc/.pihole/ && git describe --tags --abbrev=0)" \
+  && log_echo -r "Pi-hole: $pi_hole_ver" || (log_echo "Pi-hole git repository not detected." && error_found=1)
+  local admin_ver="$(cd /var/www/html/admin && git describe --tags --abbrev=0)" \
+  && log_echo -r "WebUI: $admin_ver" || (log_echo "Pi-hole Admin Pages git repository not detected." && error_found=1)
+  local light_ver="$(lighttpd -v |& head -n1 | cut -d " " -f1)" \
+  && log_echo -r "${light_ver}" || (log_echo "lighttpd not installed." && error_found=1)
+  local php_ver="$(php -v |& head -n1)" \
+  && log_echo -r "${php_ver}" || (log_echo "PHP not installed." && error_found=1)
+  return "${error_found}"
 }
 
 files_check() {
@@ -133,7 +133,7 @@ files_check() {
      echo ":::       File exists"
      file_parse "${search_file}"
      return 0
-	else
+  else
     log_echo "${1} not found!"
     return 1
   fi
@@ -150,8 +150,8 @@ distro_check() {
   local soft_fail
   header_write "Detecting installed OS Distribution"
   soft_fail=0
-	local distro="$(cat /etc/*release)" && block_parse "${distro}" || (log_echo "Distribution details not found." && soft_fail=1)
-	return "${soft_fail}"
+  local distro="$(cat /etc/*release)" && block_parse "${distro}" || (log_echo "Distribution details not found." && soft_fail=1)
+  return "${soft_fail}"
 }
 
 processor_check() {
@@ -171,22 +171,22 @@ ipv6_check() {
 
 
 ip_check() {
-	header_write "IP Address Information"
-	# Get the current interface for Internet traffic
+  header_write "IP Address Information"
+  # Get the current interface for Internet traffic
 
-	# Check if IPv6 enabled
-	local IPv6_interface
-	local IPv4_interface
-	ipv6_check &&	IPv6_interface=${piholeInterface:-$(ip -6 r | grep default | cut -d ' ' -f 5)}
-	# If declared in setupVars.conf use it, otherwise defer to default
-	# http://stackoverflow.com/questions/2013547/assigning-default-values-to-shell-variables-with-a-single-command-in-bash
+  # Check if IPv6 enabled
+  local IPv6_interface
+  local IPv4_interface
+  ipv6_check &&	IPv6_interface=${piholeInterface:-$(ip -6 r | grep default | cut -d ' ' -f 5)}
+  # If declared in setupVars.conf use it, otherwise defer to default
+  # http://stackoverflow.com/questions/2013547/assigning-default-values-to-shell-variables-with-a-single-command-in-bash
   IPv4_interface=${piholeInterface:-$(ip r | grep default | cut -d ' ' -f 5)}
 
 
   if [[ IPV6_READY ]]; then
     local IPv6_addr_list="$(ip a | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "inet6") print $(i+1) }')" \
-	  && (log_write "${IPv6_addr_list}" && echo ":::       IPv6 addresses located") \
-	  || log_echo "No IPv6 addresses found."
+    && (log_write "${IPv6_addr_list}" && echo ":::       IPv6 addresses located") \
+    || log_echo "No IPv6 addresses found."
 
     local IPv6_def_gateway=$(ip -6 r | grep default | cut -d ' ' -f 3)
     if [[ $? = 0 ]] && [[ -n ${IPv6_def_gateway} ]]; then
@@ -206,23 +206,23 @@ ip_check() {
     fi
 
 local IPv4_addr_list="$(ip a | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "inet") print $(i+1) }')" \
-	&& (block_parse "${IPv4_addr_list}" && echo ":::       IPv4 addresses located")\
-	|| log_echo "No IPv4 addresses found."
+  && (block_parse "${IPv4_addr_list}" && echo ":::       IPv4 addresses located")\
+  || log_echo "No IPv4 addresses found."
 
-	local IPv4_def_gateway=$(ip r | grep default | cut -d ' ' -f 3)
-	if [[ $? = 0 ]]; then
-		echo -n ":::        Pinging default IPv4 gateway: "
-		local IPv4_def_gateway_check="$(ping -q -w 3 -c 3 -n "${IPv4_def_gateway}"  -I "${IPv4_interface}" | tail -n3)" \
-		&& echo "Gateway responded." \
-		|| echo "Gateway did not respond."
-		block_parse "${IPv4_def_gateway_check}"
+  local IPv4_def_gateway=$(ip r | grep default | cut -d ' ' -f 3)
+  if [[ $? = 0 ]]; then
+    echo -n ":::        Pinging default IPv4 gateway: "
+    local IPv4_def_gateway_check="$(ping -q -w 3 -c 3 -n "${IPv4_def_gateway}"  -I "${IPv4_interface}" | tail -n3)" \
+    && echo "Gateway responded." \
+    || echo "Gateway did not respond."
+    block_parse "${IPv4_def_gateway_check}"
 
-		echo -n ":::        Pinging Internet via IPv4: "
-		local IPv4_inet_check="$(ping -q -w 5 -c 3 -n 8.8.8.8 -I "${IPv4_interface}" | tail -n3)" \
-		&& echo "Query responded." \
-		|| echo "Query did not respond."
-		block_parse "${IPv4_inet_check}"
-	fi
+    echo -n ":::        Pinging Internet via IPv4: "
+    local IPv4_inet_check="$(ping -q -w 5 -c 3 -n 8.8.8.8 -I "${IPv4_interface}" | tail -n3)" \
+    && echo "Query responded." \
+    || echo "Query did not respond."
+    block_parse "${IPv4_inet_check}"
+  fi
 
   fi
 }
@@ -237,76 +237,76 @@ port_check() {
 
 daemon_check() {
   # Check for daemon ${1} on port ${2}
-	header_write "Daemon Process Information"
+  header_write "Daemon Process Information"
 
-	echo ":::     Checking ${2} port for ${1} listener."
+  echo ":::     Checking ${2} port for ${1} listener."
 
-	if [[ ${IPV6_READY} ]]; then
-	  port_check 6 "${2}" "${1}"
+  if [[ ${IPV6_READY} ]]; then
+    port_check 6 "${2}" "${1}"
   fi
-	lsof_value=$(lsof -i 4:${2} -FcL | tr '\n' ' ') \
+  lsof_value=$(lsof -i 4:${2} -FcL | tr '\n' ' ') \
     port_check 4 "${2}" "${1}"
 }
 
 testResolver() {
-	header_write "Resolver Functions Check"
+  header_write "Resolver Functions Check"
 
-	# Find a blocked url that has not been whitelisted.
-	TESTURL="doubleclick.com"
-	if [ -s "${WHITELISTMATCHES}" ]; then
-		while read -r line; do
-			CUTURL=${line#*" "}
-			if [ "${CUTURL}" != "Pi-Hole.IsWorking.OK" ]; then
-				while read -r line2; do
-					CUTURL2=${line2#*" "}
-					if [ "${CUTURL}" != "${CUTURL2}" ]; then
-						TESTURL="${CUTURL}"
-						break 2
-					fi
-				done < "${WHITELISTMATCHES}"
-			fi
-		done < "${GRAVITYFILE}"
-	fi
+  # Find a blocked url that has not been whitelisted.
+  TESTURL="doubleclick.com"
+  if [ -s "${WHITELISTMATCHES}" ]; then
+    while read -r line; do
+      CUTURL=${line#*" "}
+      if [ "${CUTURL}" != "Pi-Hole.IsWorking.OK" ]; then
+        while read -r line2; do
+          CUTURL2=${line2#*" "}
+          if [ "${CUTURL}" != "${CUTURL2}" ]; then
+            TESTURL="${CUTURL}"
+            break 2
+          fi
+        done < "${WHITELISTMATCHES}"
+      fi
+    done < "${GRAVITYFILE}"
+  fi
 
-	log_write "Resolution of ${TESTURL} from Pi-hole:"
-	LOCALDIG=$(dig "${TESTURL}" @127.0.0.1)
-	if [[ $? = 0 ]]; then
-		log_write "${LOCALDIG}"
-	else
-		log_write "Failed to resolve ${TESTURL} on Pi-hole"
-	fi
-	log_write ""
+  log_write "Resolution of ${TESTURL} from Pi-hole:"
+  LOCALDIG=$(dig "${TESTURL}" @127.0.0.1)
+  if [[ $? = 0 ]]; then
+    log_write "${LOCALDIG}"
+  else
+    log_write "Failed to resolve ${TESTURL} on Pi-hole"
+  fi
+  log_write ""
 
 
-	log_write "Resolution of ${TESTURL} from 8.8.8.8:"
-	REMOTEDIG=$(dig "${TESTURL}" @8.8.8.8)
-	if [[ $? = 0 ]]; then
-		log_write "${REMOTEDIG}"
-	else
-		log_write "Failed to resolve ${TESTURL} on 8.8.8.8"
-	fi
-	log_write ""
+  log_write "Resolution of ${TESTURL} from 8.8.8.8:"
+  REMOTEDIG=$(dig "${TESTURL}" @8.8.8.8)
+  if [[ $? = 0 ]]; then
+    log_write "${REMOTEDIG}"
+  else
+    log_write "Failed to resolve ${TESTURL} on 8.8.8.8"
+  fi
+  log_write ""
 
-	log_write "Pi-hole dnsmasq specific records lookups"
-	log_write "Cache Size:"
-	dig +short chaos txt cachesize.bind >> ${DEBUG_LOG}
-	log_write "Upstream Servers:"
-	dig +short chaos txt servers.bind >> ${DEBUG_LOG}
-	log_write ""
+  log_write "Pi-hole dnsmasq specific records lookups"
+  log_write "Cache Size:"
+  dig +short chaos txt cachesize.bind >> ${DEBUG_LOG}
+  log_write "Upstream Servers:"
+  dig +short chaos txt servers.bind >> ${DEBUG_LOG}
+  log_write ""
 }
 
 checkProcesses() {
-	header_write "Processes Check"
+  header_write "Processes Check"
 
-	echo ":::     Logging status of lighttpd and dnsmasq..."
-	PROCESSES=( lighttpd dnsmasq )
-	for i in "${PROCESSES[@]}"; do
-		log_write ""
-		log_write "${i}"
-		log_write " processes status:"
-		systemctl -l status "${i}" >> "${DEBUG_LOG}"
-	done
-	log_write ""
+  echo ":::     Logging status of lighttpd and dnsmasq..."
+  PROCESSES=( lighttpd dnsmasq )
+  for i in "${PROCESSES[@]}"; do
+    log_write ""
+    log_write "${i}"
+    log_write " processes status:"
+    systemctl -l status "${i}" >> "${DEBUG_LOG}"
+  done
+  log_write ""
 }
 
 debugLighttpd() {
@@ -344,50 +344,50 @@ files_check "${ADLISTFILE}"
 
 header_write "Analyzing gravity.list"
 
-	gravity_length=$(wc -l "${GRAVITYFILE}") \
-	&& log_write "${GRAVITYFILE} is ${gravity_length} lines long." \
-	|| log_echo "Warning: No gravity.list file found!"
+  gravity_length=$(wc -l "${GRAVITYFILE}") \
+  && log_write "${GRAVITYFILE} is ${gravity_length} lines long." \
+  || log_echo "Warning: No gravity.list file found!"
 
 # Continuously append the pihole.log file to the pihole_debug.log file
 dumpPiHoleLog() {
-	trap '{ echo -e "\n::: Finishing debug write from interrupt... Quitting!" ; exit 1; }' INT
-	echo "::: "
-	echo "::: --= User Action Required =--"
-	echo -e "::: Try loading a site that you are having trouble with now from a client web browser.. \n:::\t(Press CTRL+C to finish logging.)"
-	header_write "pihole.log"
-	if [ -e "${PIHOLELOG}" ]; then
-		while true; do
-			tail -f "${PIHOLELOG}" >> ${DEBUG_LOG}
-			log_write ""
-		done
-	else
-		log_write "No pihole.log file found!"
-		printf ":::\tNo pihole.log file found!\n"
-	fi
+  trap '{ echo -e "\n::: Finishing debug write from interrupt... Quitting!" ; exit 1; }' INT
+  echo "::: "
+  echo "::: --= User Action Required =--"
+  echo -e "::: Try loading a site that you are having trouble with now from a client web browser.. \n:::\t(Press CTRL+C to finish logging.)"
+  header_write "pihole.log"
+  if [ -e "${PIHOLELOG}" ]; then
+    while true; do
+      tail -f "${PIHOLELOG}" >> ${DEBUG_LOG}
+      log_write ""
+    done
+  else
+    log_write "No pihole.log file found!"
+    printf ":::\tNo pihole.log file found!\n"
+  fi
 }
 
 # Anything to be done after capturing of pihole.log terminates
 finalWork() {
   local tricorder
-	echo "::: Finshed debugging!"
-	echo "::: The debug log can be uploaded to tricorder.pi-hole.net for sharing with developers only."
-	read -r -p "::: Would you like to upload the log? [y/N] " response
-	case ${response} in
-		[yY][eE][sS]|[yY])
-			tricorder=$(cat /var/log/pihole_debug.log | nc tricorder.pi-hole.net 9999)
-			;;
-		*)
-			echo "::: Log will NOT be uploaded to tricorder."
-			;;
-	esac
+  echo "::: Finshed debugging!"
+  echo "::: The debug log can be uploaded to tricorder.pi-hole.net for sharing with developers only."
+  read -r -p "::: Would you like to upload the log? [y/N] " response
+  case ${response} in
+    [yY][eE][sS]|[yY])
+      tricorder=$(cat /var/log/pihole_debug.log | nc tricorder.pi-hole.net 9999)
+      ;;
+    *)
+      echo "::: Log will NOT be uploaded to tricorder."
+      ;;
+  esac
 
-	# Check if tricorder.pi-hole.net is reachable and provide token.
-	if [ -n "${tricorder}" ]; then
-		echo "::: Your debug token is : ${tricorder}"
-		echo "::: Please contact the Pi-hole team with your token to being assistance."
-		echo "::: Thank you."
-	fi
-		echo "::: Debug log can be found at : /var/log/pihole_debug.log"
+  # Check if tricorder.pi-hole.net is reachable and provide token.
+  if [ -n "${tricorder}" ]; then
+    echo "::: Your debug token is : ${tricorder}"
+    echo "::: Please contact the Pi-hole team with your token to being assistance."
+    echo "::: Thank you."
+  fi
+    echo "::: Debug log can be found at : /var/log/pihole_debug.log"
 }
 
 trap finalWork EXIT
diff --git a/advanced/Scripts/setupLCD.sh b/advanced/Scripts/setupLCD.sh
index e5a01911..feca655d 100755
--- a/advanced/Scripts/setupLCD.sh
+++ b/advanced/Scripts/setupLCD.sh
@@ -15,28 +15,28 @@
 # Borrowed from adafruit-pitft-helper < borrowed from raspi-config
 # https://github.com/adafruit/Adafruit-PiTFT-Helper/blob/master/adafruit-pitft-helper#L324-L334
 getInitSys() {
-	if command -v systemctl > /dev/null && systemctl | grep -q '\-\.mount'; then
-		SYSTEMD=1
-	elif [ -f /etc/init.d/cron ] && [ ! -h /etc/init.d/cron ]; then
-		SYSTEMD=0
-	else
-		echo "Unrecognised init system"
-		return 1
-	fi
+  if command -v systemctl > /dev/null && systemctl | grep -q '\-\.mount'; then
+    SYSTEMD=1
+  elif [ -f /etc/init.d/cron ] && [ ! -h /etc/init.d/cron ]; then
+    SYSTEMD=0
+  else
+    echo "Unrecognised init system"
+    return 1
+  fi
 }
 
 # Borrowed from adafruit-pitft-helper:
 # https://github.com/adafruit/Adafruit-PiTFT-Helper/blob/master/adafruit-pitft-helper#L274-L285
 autoLoginPiToConsole() {
-	if [ -e /etc/init.d/lightdm ]; then
-		if [ ${SYSTEMD} -eq 1 ]; then
-			systemctl set-default multi-user.target
-			ln -fs /etc/systemd/system/autologin@.service /etc/systemd/system/getty.target.wants/getty@tty1.service
-		else
-			update-rc.d lightdm disable 2
-			sed /etc/inittab -i -e "s/1:2345:respawn:\/sbin\/getty --noclear 38400 tty1/1:2345:respawn:\/bin\/login -f pi tty1 <\/dev\/tty1 >\/dev\/tty1 2>&1/"
-		fi
-	fi
+  if [ -e /etc/init.d/lightdm ]; then
+    if [ ${SYSTEMD} -eq 1 ]; then
+      systemctl set-default multi-user.target
+      ln -fs /etc/systemd/system/autologin@.service /etc/systemd/system/getty.target.wants/getty@tty1.service
+    else
+      update-rc.d lightdm disable 2
+      sed /etc/inittab -i -e "s/1:2345:respawn:\/sbin\/getty --noclear 38400 tty1/1:2345:respawn:\/bin\/login -f pi tty1 <\/dev\/tty1 >\/dev\/tty1 2>&1/"
+    fi
+  fi
 }
 
 ######### SCRIPT ###########
diff --git a/advanced/Scripts/update.sh b/advanced/Scripts/update.sh
index a2220d57..372d6223 100644
--- a/advanced/Scripts/update.sh
+++ b/advanced/Scripts/update.sh
@@ -18,64 +18,64 @@ piholeGitUrl="https://github.com/pi-hole/pi-hole.git"
 piholeFilesDir="/etc/.pihole"
 
 spinner() {
-	local pid=${1}
-	local delay=0.50
-	local spinstr='/-\|'
-	while [ "$(ps a | awk '{print $1}' | grep "${pid}")" ]; do
-		local temp=${spinstr#?}
-		printf " [%c]  " "${spinstr}"
-		local spinstr=${temp}${spinstr%"$temp"}
-		sleep ${delay}
-		printf "\b\b\b\b\b\b"
-	done
-	printf "    \b\b\b\b"
+  local pid=${1}
+  local delay=0.50
+  local spinstr='/-\|'
+  while [ "$(ps a | awk '{print $1}' | grep "${pid}")" ]; do
+    local temp=${spinstr#?}
+    printf " [%c]  " "${spinstr}"
+    local spinstr=${temp}${spinstr%"$temp"}
+    sleep ${delay}
+    printf "\b\b\b\b\b\b"
+  done
+  printf "    \b\b\b\b"
 }
 
 getGitFiles() {
-	# Setup git repos for directory and repository passed
-	# as arguments 1 and 2
-	echo ":::"
-	echo "::: Checking for existing repository..."
-	if is_repo "${1}"; then
-		update_repo "${1}"
-	else
-		make_repo "${1}" "${2}"
-	fi
+  # Setup git repos for directory and repository passed
+  # as arguments 1 and 2
+  echo ":::"
+  echo "::: Checking for existing repository..."
+  if is_repo "${1}"; then
+    update_repo "${1}"
+  else
+    make_repo "${1}" "${2}"
+  fi
 }
 
 is_repo() {
-	# Use git to check if directory is currently under VCS
-	echo -n ":::    Checking $1 is a repo..."
-	cd "${1}" &> /dev/null || return 1
-	git status &> /dev/null && echo " OK!"; return 0 || echo " not found!"; return 1
+  # Use git to check if directory is currently under VCS
+  echo -n ":::    Checking $1 is a repo..."
+  cd "${1}" &> /dev/null || return 1
+  git status &> /dev/null && echo " OK!"; return 0 || echo " not found!"; return 1
 }
 
 make_repo() {
-	# Remove the non-repod interface and clone the interface
-	echo -n ":::    Cloning $2 into $1..."
-	rm -rf "${1}"
-	git clone -q --depth 1 "${2}" "${1}" > /dev/null & spinner $!
-	echo " done!"
+  # Remove the non-repod interface and clone the interface
+  echo -n ":::    Cloning $2 into $1..."
+  rm -rf "${1}"
+  git clone -q --depth 1 "${2}" "${1}" > /dev/null & spinner $!
+  echo " done!"
 }
 
 update_repo() {
 # Pull the latest commits
-	echo -n ":::     Updating repo in $1..."
-	cd "${1}" || exit 1
-	git stash -q > /dev/null & spinner $!
-	git pull -q > /dev/null & spinner $!
-	echo " done!"
+  echo -n ":::     Updating repo in $1..."
+  cd "${1}" || exit 1
+  git stash -q > /dev/null & spinner $!
+  git pull -q > /dev/null & spinner $!
+  echo " done!"
 }
 
 if [ ! -d "/etc/.pihole" ]; then #This is unlikely
-	echo "::: Critical Error: Pi-Hole repo missing from system!"
-	echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
-	exit 1;
+  echo "::: Critical Error: Pi-Hole repo missing from system!"
+  echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
+  exit 1;
 fi
 if [ ! -d "/var/www/html/admin" ]; then #This is unlikely
-	echo "::: Critical Error: Pi-Hole repo missing from system!"
-	echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
-	exit 1;
+  echo "::: Critical Error: Pi-Hole repo missing from system!"
+  echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
+  exit 1;
 fi
 
 echo "::: Checking for updates..."
@@ -105,38 +105,38 @@ echo ":::"
 
 
 if [[ ${piholeVersion} == ${piholeVersionLatest} && ${webVersion} == ${webVersionLatest} ]]; then
-	echo "::: Everything is up to date!"
-	echo ""
-	exit 0
+  echo "::: Everything is up to date!"
+  echo ""
+  exit 0
 
 elif [[ ${piholeVersion} == ${piholeVersionLatest} && ${webVersion} != ${webVersionLatest} ]]; then
-	echo "::: Pi-hole Web Admin files out of date"
-	getGitFiles ${webInterfaceDir} ${webInterfaceGitUrl}
-	echo ":::"
-	webVersion=$(pihole -v -a -c)
-	echo "::: Web Admin version is now at ${webVersion}"
-	echo "::: If you had made any changes in '/var/www/html/admin', they have been stashed using 'git stash'"
-	echo ""
+  echo "::: Pi-hole Web Admin files out of date"
+  getGitFiles ${webInterfaceDir} ${webInterfaceGitUrl}
+  echo ":::"
+  webVersion=$(pihole -v -a -c)
+  echo "::: Web Admin version is now at ${webVersion}"
+  echo "::: If you had made any changes in '/var/www/html/admin', they have been stashed using 'git stash'"
+  echo ""
 elif [[ ${piholeVersion} != ${piholeVersionLatest} && ${webVersion} == ${webVersionLatest} ]]; then
-	echo "::: Pi-hole core files out of date"
-	getGitFiles ${piholeFilesDir} ${piholeGitUrl}
-	/etc/.pihole/automated\ install/basic-install.sh --reconfigure --unattended
-	echo ":::"
-	piholeVersion=$(pihole -v -p -c)
-	echo "::: Pi-hole version is now at ${piholeVersion}"
-	echo "::: If you had made any changes in '/etc/.pihole', they have been stashed using 'git stash'"
-	echo ""
+  echo "::: Pi-hole core files out of date"
+  getGitFiles ${piholeFilesDir} ${piholeGitUrl}
+  /etc/.pihole/automated\ install/basic-install.sh --reconfigure --unattended
+  echo ":::"
+  piholeVersion=$(pihole -v -p -c)
+  echo "::: Pi-hole version is now at ${piholeVersion}"
+  echo "::: If you had made any changes in '/etc/.pihole', they have been stashed using 'git stash'"
+  echo ""
 elif [[ ${piholeVersion} != ${piholeVersionLatest} && ${webVersion} != ${webVersionLatest} ]]; then
-	echo "::: Updating Everything"
-	getGitFiles ${piholeFilesDir} ${piholeGitUrl}
-	/etc/.pihole/automated\ install/basic-install.sh --unattended
-	webVersion=$(pihole -v -a -c)
-	piholeVersion=$(pihole -v -p -c)
-	echo ":::"
-	echo "::: Pi-hole version is now at ${piholeVersion}"
-	echo "::: If you had made any changes in '/etc/.pihole', they have been stashed using 'git stash'"
-	echo ":::"
-	echo "::: Pi-hole version is now at ${piholeVersion}"
-	echo "::: If you had made any changes in '/etc/.pihole', they have been stashed using 'git stash'"
-	echo ""
+  echo "::: Updating Everything"
+  getGitFiles ${piholeFilesDir} ${piholeGitUrl}
+  /etc/.pihole/automated\ install/basic-install.sh --unattended
+  webVersion=$(pihole -v -a -c)
+  piholeVersion=$(pihole -v -p -c)
+  echo ":::"
+  echo "::: Pi-hole version is now at ${piholeVersion}"
+  echo "::: If you had made any changes in '/etc/.pihole', they have been stashed using 'git stash'"
+  echo ":::"
+  echo "::: Pi-hole version is now at ${piholeVersion}"
+  echo "::: If you had made any changes in '/etc/.pihole', they have been stashed using 'git stash'"
+  echo ""
 fi
diff --git a/advanced/Scripts/version.sh b/advanced/Scripts/version.sh
index ca78032a..b3d46541 100644
--- a/advanced/Scripts/version.sh
+++ b/advanced/Scripts/version.sh
@@ -15,62 +15,62 @@ latest=false
 current=false
 
 normalOutput() {
-	piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
-	webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
+  piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
+  webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
 
-	piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
-	webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
+  piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
+  webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
 
-	echo "::: Pi-hole version is ${piholeVersion} (Latest version is ${piholeVersionLatest})"
-	echo "::: Web-Admin version is ${webVersion} (Latest version is ${webVersionLatest})"
+  echo "::: Pi-hole version is ${piholeVersion} (Latest version is ${piholeVersionLatest})"
+  echo "::: Web-Admin version is ${webVersion} (Latest version is ${webVersionLatest})"
 }
 
 webOutput() {
-	for var in "$@"; do
-		case "${var}" in
-			"-l" | "--latest"    ) latest=true;;
-			"-c" | "--current"   ) current=true;;
-			*                    ) echo "::: Invalid Option!"; exit 1;
-		esac
-	done
+  for var in "$@"; do
+    case "${var}" in
+      "-l" | "--latest"    ) latest=true;;
+      "-c" | "--current"   ) current=true;;
+      *                    ) echo "::: Invalid Option!"; exit 1;
+    esac
+  done
 
-	if [[ "${latest}" == true && "${current}" == false ]]; then
-		webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
-		echo ${webVersionLatest}
-	elif [[ "${latest}" == false && "${current}" == true ]]; then
-		webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
-		echo ${webVersion}
-	else
-		webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
-		webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
-		echo "::: Web-Admin version is $webVersion (Latest version is $webVersionLatest)"
-	fi
+  if [[ "${latest}" == true && "${current}" == false ]]; then
+    webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
+    echo ${webVersionLatest}
+  elif [[ "${latest}" == false && "${current}" == true ]]; then
+    webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
+    echo ${webVersion}
+  else
+    webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
+    webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
+    echo "::: Web-Admin version is $webVersion (Latest version is $webVersionLatest)"
+  fi
 }
 
 coreOutput() {
-	for var in "$@"; do
-		case "${var}" in
-			"-l" | "--latest"    ) latest=true;;
-			"-c" | "--current"   ) current=true;;
-			*                    ) echo "::: Invalid Option!"; exit 1;
-		esac
-	done
+  for var in "$@"; do
+    case "${var}" in
+      "-l" | "--latest"    ) latest=true;;
+      "-c" | "--current"   ) current=true;;
+      *                    ) echo "::: Invalid Option!"; exit 1;
+    esac
+  done
 
-	if [[ "${latest}" == true && "${current}" == false ]]; then
-		piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
-		echo ${piholeVersionLatest}
-	elif [[ "${latest}" == false && "${current}" == true ]]; then
-		piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
-		echo ${piholeVersion}
-	else
-		piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
-		piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
-		echo "::: Pi-hole version is $piholeVersion (Latest version is $piholeVersionLatest)"
-	fi
+  if [[ "${latest}" == true && "${current}" == false ]]; then
+    piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
+    echo ${piholeVersionLatest}
+  elif [[ "${latest}" == false && "${current}" == true ]]; then
+    piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
+    echo ${piholeVersion}
+  else
+    piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
+    piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' |  perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
+    echo "::: Pi-hole version is $piholeVersion (Latest version is $piholeVersionLatest)"
+  fi
 }
 
 helpFunc() {
-	cat << EOM
+  cat << EOM
 :::
 ::: Show Pi-hole/Web Admin versions
 :::
@@ -84,17 +84,17 @@ helpFunc() {
 :::  -h, --help           Show this help dialog
 :::
 EOM
-	exit 1
+  exit 1
 }
 
 if [[ $# = 0 ]]; then
-	normalOutput
+  normalOutput
 fi
 
 for var in "$@"; do
-	case "${var}" in
-	"-a" | "--admin"     ) shift; webOutput "$@";;
-	"-p" | "--pihole"    ) shift; coreOutput "$@" ;;
-	"-h" | "--help"      ) helpFunc;;
-	esac
+  case "${var}" in
+  "-a" | "--admin"     ) shift; webOutput "$@";;
+  "-p" | "--pihole"    ) shift; coreOutput "$@" ;;
+  "-h" | "--help"      ) helpFunc;;
+  esac
 done