From 1911c3690d2970cb03741266dd44adf12be0e61c Mon Sep 17 00:00:00 2001
From: Rob Gill <rrobgill@protonmail.com>
Date: Tue, 29 May 2018 17:59:39 +1000
Subject: [PATCH] Style/Tabs to spaces

uninstall.sh contains a mix of tabs and spaces for indentation in different parts of the file.

Everywhere that used tabs has been converted to spaces, compatible with the indentation style used in basic_install.sh

No code has been altered, only the use of tabs and spaces in indention.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
---
 automated install/uninstall.sh | 208 ++++++++++++++++-----------------
 1 file changed, 104 insertions(+), 104 deletions(-)

diff --git a/automated install/uninstall.sh b/automated install/uninstall.sh
index 2f4c58a1..a077ff44 100755
--- a/automated install/uninstall.sh	
+++ b/automated install/uninstall.sh	
@@ -11,29 +11,29 @@
 source "/opt/pihole/COL_TABLE"
 
 while true; do
-	read -rp "  ${QST} Are you sure you would like to remove ${COL_WHITE}Pi-hole${COL_NC}? [y/N] " yn
-	case ${yn} in
-		[Yy]* ) break;;
-		[Nn]* ) echo -e "\n  ${COL_LIGHT_GREEN}Uninstall has been cancelled${COL_NC}"; exit 0;;
+  read -rp "  ${QST} Are you sure you would like to remove ${COL_WHITE}Pi-hole${COL_NC}? [y/N] " yn
+  case ${yn} in
+    [Yy]* ) break;;
+    [Nn]* ) echo -e "\n  ${COL_LIGHT_GREEN}Uninstall has been cancelled${COL_NC}"; exit 0;;
     * ) echo -e "\n  ${COL_LIGHT_GREEN}Uninstall has been cancelled${COL_NC}"; exit 0;;
-	esac
+  esac
 done
 
 # Must be root to uninstall
 str="Root user check"
 if [[ ${EUID} -eq 0 ]]; then
-	echo -e "  ${TICK} ${str}"
+  echo -e "  ${TICK} ${str}"
 else
-	# Check if sudo is actually installed
-	# If it isn't, exit because the uninstall can not complete
-	if [ -x "$(command -v sudo)" ]; then
-		export SUDO="sudo"
-	else
+  # Check if sudo is actually installed
+  # If it isn't, exit because the uninstall can not complete
+  if [ -x "$(command -v sudo)" ]; then
+    export SUDO="sudo"
+  else
     echo -e "  ${CROSS} ${str}
        Script called with non-root privileges
        The Pi-hole requires elevated privleges to uninstall"
-		exit 1
-	fi
+    exit 1
+  fi
 fi
 
 readonly PI_HOLE_FILES_DIR="/etc/.pihole"
@@ -54,115 +54,115 @@ fi
 
 # Compatability
 if [ -x "$(command -v rpm)" ]; then
-	# Fedora Family
-	PKG_REMOVE="${PKG_MANAGER} remove -y"
-	package_check() {
-		rpm -qa | grep ^$1- > /dev/null
-	}
-	package_cleanup() {
-		${SUDO} ${PKG_MANAGER} -y autoremove
-	}
+  # Fedora Family
+  PKG_REMOVE="${PKG_MANAGER} remove -y"
+  package_check() {
+    rpm -qa | grep ^$1- > /dev/null
+  }
+  package_cleanup() {
+    ${SUDO} ${PKG_MANAGER} -y autoremove
+  }
 elif [ -x "$(command -v apt-get)" ]; then
-	# Debian Family
-	PKG_REMOVE="${PKG_MANAGER} -y remove --purge"
-	package_check() {
-		dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed"
-	}
-	package_cleanup() {
-		${SUDO} ${PKG_MANAGER} -y autoremove
-		${SUDO} ${PKG_MANAGER} -y autoclean
-	}
+  # Debian Family
+  PKG_REMOVE="${PKG_MANAGER} -y remove --purge"
+  package_check() {
+    dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed"
+  }
+  package_cleanup() {
+    ${SUDO} ${PKG_MANAGER} -y autoremove
+    ${SUDO} ${PKG_MANAGER} -y autoclean
+  }
 else
   echo -e "  ${CROSS} OS distribution not supported"
-	exit 1
+  exit 1
 fi
 
 removeAndPurge() {
-	# Purge dependencies
+  # Purge dependencies
   echo ""
-	for i in "${DEPS[@]}"; do
-		package_check ${i} > /dev/null
-		if [[ "$?" -eq 0 ]]; then
-			while true; do
-				read -rp "  ${QST} Do you wish to remove ${COL_WHITE}${i}${COL_NC} from your system? [Y/N] " yn
-				case ${yn} in
-					[Yy]* )
+  for i in "${DEPS[@]}"; do
+    package_check ${i} > /dev/null
+    if [[ "$?" -eq 0 ]]; then
+      while true; do
+        read -rp "  ${QST} Do you wish to remove ${COL_WHITE}${i}${COL_NC} from your system? [Y/N] " yn
+        case ${yn} in
+          [Yy]* )
             echo -ne "  ${INFO} Removing ${i}...";
             ${SUDO} ${PKG_REMOVE} "${i}" &> /dev/null;
             echo -e "${OVER}  ${INFO} Removed ${i}";
             break;;
-					[Nn]* ) echo -e "  ${INFO} Skipped ${i}"; break;;
-				esac
-			done
-		else
-			echo -e "  ${INFO} Package ${i} not installed"
-		fi
-	done
+          [Nn]* ) echo -e "  ${INFO} Skipped ${i}"; break;;
+        esac
+      done
+    else
+      echo -e "  ${INFO} Package ${i} not installed"
+    fi
+  done
 
-	# Remove dnsmasq config files
-	${SUDO} rm -f /etc/dnsmasq.conf /etc/dnsmasq.conf.orig /etc/dnsmasq.d/01-pihole.conf &> /dev/null
+  # Remove dnsmasq config files
+  ${SUDO} rm -f /etc/dnsmasq.conf /etc/dnsmasq.conf.orig /etc/dnsmasq.d/01-pihole.conf &> /dev/null
   echo -e "  ${TICK} Removing dnsmasq config files"
 
-	# Take care of any additional package cleaning
-	echo -ne "  ${INFO} Removing & cleaning remaining dependencies..."
-	package_cleanup &> /dev/null
+  # Take care of any additional package cleaning
+  echo -ne "  ${INFO} Removing & cleaning remaining dependencies..."
+  package_cleanup &> /dev/null
   echo -e "${OVER}  ${TICK} Removed & cleaned up remaining dependencies"
 
-	# Call removeNoPurge to remove Pi-hole specific files
-	removeNoPurge
+  # Call removeNoPurge to remove Pi-hole specific files
+  removeNoPurge
 }
 
 removeNoPurge() {
-	# Only web directories/files that are created by Pi-hole should be removed
-	echo -ne "  ${INFO} Removing Web Interface..."
-	${SUDO} rm -rf /var/www/html/admin &> /dev/null
-	${SUDO} rm -rf /var/www/html/pihole &> /dev/null
-	${SUDO} rm -f /var/www/html/index.lighttpd.orig &> /dev/null
+  # Only web directories/files that are created by Pi-hole should be removed
+  echo -ne "  ${INFO} Removing Web Interface..."
+  ${SUDO} rm -rf /var/www/html/admin &> /dev/null
+  ${SUDO} rm -rf /var/www/html/pihole &> /dev/null
+  ${SUDO} rm -f /var/www/html/index.lighttpd.orig &> /dev/null
 
-	# If the web directory is empty after removing these files, then the parent html folder can be removed.
-	if [ -d "/var/www/html" ]; then
-		if [[ ! "$(ls -A /var/www/html)" ]]; then
-    			${SUDO} rm -rf /var/www/html &> /dev/null
-		fi
-	fi
+  # If the web directory is empty after removing these files, then the parent html folder can be removed.
+  if [ -d "/var/www/html" ]; then
+    if [[ ! "$(ls -A /var/www/html)" ]]; then
+      ${SUDO} rm -rf /var/www/html &> /dev/null
+    fi
+  fi
   echo -e "${OVER}  ${TICK} Removed Web Interface"
 
-	# Attempt to preserve backwards compatibility with older versions
-	# to guarantee no additional changes were made to /etc/crontab after
-	# the installation of pihole, /etc/crontab.pihole should be permanently
-	# preserved.
-	if [[ -f /etc/crontab.orig ]]; then
-		${SUDO} mv /etc/crontab /etc/crontab.pihole
-		${SUDO} mv /etc/crontab.orig /etc/crontab
-		${SUDO} service cron restart
+  # Attempt to preserve backwards compatibility with older versions
+  # to guarantee no additional changes were made to /etc/crontab after
+  # the installation of pihole, /etc/crontab.pihole should be permanently
+  # preserved.
+  if [[ -f /etc/crontab.orig ]]; then
+    ${SUDO} mv /etc/crontab /etc/crontab.pihole
+    ${SUDO} mv /etc/crontab.orig /etc/crontab
+    ${SUDO} service cron restart
     echo -e "  ${TICK} Restored the default system cron"
-	fi
+  fi
 
-	# Attempt to preserve backwards compatibility with older versions
-	if [[ -f /etc/cron.d/pihole ]];then
-		${SUDO} rm -f /etc/cron.d/pihole &> /dev/null
+  # Attempt to preserve backwards compatibility with older versions
+  if [[ -f /etc/cron.d/pihole ]];then
+    ${SUDO} rm -f /etc/cron.d/pihole &> /dev/null
     echo -e "  ${TICK} Removed /etc/cron.d/pihole"
-	fi
+  fi
 
-	package_check lighttpd > /dev/null
-	if [[ $? -eq 1 ]]; then
-		${SUDO} rm -rf /etc/lighttpd/ &> /dev/null
-    	echo -e "  ${TICK} Removed lighttpd"
-	else
-		if [ -f /etc/lighttpd/lighttpd.conf.orig ]; then
-			${SUDO} mv /etc/lighttpd/lighttpd.conf.orig /etc/lighttpd/lighttpd.conf
-		fi
-	fi
+  package_check lighttpd > /dev/null
+  if [[ $? -eq 1 ]]; then
+    ${SUDO} rm -rf /etc/lighttpd/ &> /dev/null
+      echo -e "  ${TICK} Removed lighttpd"
+  else
+    if [ -f /etc/lighttpd/lighttpd.conf.orig ]; then
+      ${SUDO} mv /etc/lighttpd/lighttpd.conf.orig /etc/lighttpd/lighttpd.conf
+    fi
+  fi
 
-	${SUDO} rm -f /etc/dnsmasq.d/adList.conf &> /dev/null
-	${SUDO} rm -f /etc/dnsmasq.d/01-pihole.conf &> /dev/null
-	${SUDO} rm -rf /var/log/*pihole* &> /dev/null
-	${SUDO} rm -rf /etc/pihole/ &> /dev/null
-	${SUDO} rm -rf /etc/.pihole/ &> /dev/null
-	${SUDO} rm -rf /opt/pihole/ &> /dev/null
-	${SUDO} rm -f /usr/local/bin/pihole &> /dev/null
-	${SUDO} rm -f /etc/bash_completion.d/pihole &> /dev/null
-	${SUDO} rm -f /etc/sudoers.d/pihole &> /dev/null
+  ${SUDO} rm -f /etc/dnsmasq.d/adList.conf &> /dev/null
+  ${SUDO} rm -f /etc/dnsmasq.d/01-pihole.conf &> /dev/null
+  ${SUDO} rm -rf /var/log/*pihole* &> /dev/null
+  ${SUDO} rm -rf /etc/pihole/ &> /dev/null
+  ${SUDO} rm -rf /etc/.pihole/ &> /dev/null
+  ${SUDO} rm -rf /opt/pihole/ &> /dev/null
+  ${SUDO} rm -f /usr/local/bin/pihole &> /dev/null
+  ${SUDO} rm -f /etc/bash_completion.d/pihole &> /dev/null
+  ${SUDO} rm -f /etc/sudoers.d/pihole &> /dev/null
   echo -e "  ${TICK} Removed config files"
 
   # Remove FTL
@@ -180,15 +180,15 @@ removeNoPurge() {
     echo -e "${OVER}  ${TICK} Removed pihole-FTL"
   fi
 
-	# If the pihole user exists, then remove
-	if id "pihole" &> /dev/null; then
-		${SUDO} userdel -r pihole 2> /dev/null
+  # If the pihole user exists, then remove
+  if id "pihole" &> /dev/null; then
+    ${SUDO} userdel -r pihole 2> /dev/null
     if [[ "$?" -eq 0 ]]; then
       echo -e "  ${TICK} Removed 'pihole' user"
     else
       echo -e "  ${CROSS} Unable to remove 'pihole' user"
     fi
-	fi
+  fi
 
   echo -e "\n   We're sorry to see you go, but thanks for checking out Pi-hole!
    If you need help, reach out to us on Github, Discourse, Reddit or Twitter
@@ -211,10 +211,10 @@ while true; do
     echo -n "${i} "
   done
   echo "${COL_NC}"
-	read -rp "  ${QST} Do you wish to go through each dependency for removal? (Choosing No will leave all dependencies installed) [Y/n] " yn
-	case ${yn} in
-		[Yy]* ) removeAndPurge; break;;
-		[Nn]* ) removeNoPurge; break;;
+  read -rp "  ${QST} Do you wish to go through each dependency for removal? (Choosing No will leave all dependencies installed) [Y/n] " yn
+  case ${yn} in
+    [Yy]* ) removeAndPurge; break;;
+    [Nn]* ) removeNoPurge; break;;
     * ) removeAndPurge; break;;
-	esac
+  esac
 done