Merge pull request #1761 from pi-hole/tweak/Uninstall

Tweak/uninstall

automated install/uninstall.sh

@@ -59,19 +59,12 @@ if [ -x "$(command -v rpm)" ]; then
 	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
-	}
 else
   echo -e "  ${CROSS} OS distribution not supported"
 	exit 1
@@ -100,14 +93,9 @@ removeAndPurge() {
 	done
 
 	# Remove dnsmasq config files
-	${SUDO} rm -f /etc/dnsmasq.conf /etc/dnsmasq.conf.orig /etc/dnsmasq.d/01-pihole.conf &> /dev/null
+	${SUDO} rm -f /etc/dnsmasq.conf /etc/dnsmasq.conf.orig /etc/dnsmasq.d/*-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
-  echo -e "${OVER}  ${TICK} Removed & cleaned up remaining dependencies"
-
 	# Call removeNoPurge to remove Pi-hole specific files
 	removeNoPurge
 }