From d3dda443cd03aa6a9ad3b1c87d3d12a68c9bb60d Mon Sep 17 00:00:00 2001
From: bcambl <blayne@blaynecampbell.com>
Date: Fri, 4 May 2018 00:02:47 -0600
Subject: [PATCH 1/2] flip uninstall compatability check

Signed-off-by: bcambl <blayne@blaynecampbell.com>
---
 automated install/uninstall.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/automated install/uninstall.sh b/automated install/uninstall.sh
index 2f4c58a1..b58c3ecb 100755
--- a/automated install/uninstall.sh	
+++ b/automated install/uninstall.sh	
@@ -53,16 +53,7 @@ if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
 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
-	}
-elif [ -x "$(command -v apt-get)" ]; then
+if [ -x "$(command -v apt-get)" ]; then
 	# Debian Family
 	PKG_REMOVE="${PKG_MANAGER} -y remove --purge"
 	package_check() {
@@ -72,6 +63,15 @@ elif [ -x "$(command -v apt-get)" ]; then
 		${SUDO} ${PKG_MANAGER} -y autoremove
 		${SUDO} ${PKG_MANAGER} -y autoclean
 	}
+elif [ -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
+	}
 else
   echo -e "  ${CROSS} OS distribution not supported"
 	exit 1

From c1ecfbfe63961850f5d8f311fe9be2db08321de4 Mon Sep 17 00:00:00 2001
From: bcambl <blayne@blaynecampbell.com>
Date: Sat, 12 May 2018 19:39:17 -0600
Subject: [PATCH 2/2] linting: Double quote to prevent globbing and word
 splitting

Signed-off-by: bcambl <blayne@blaynecampbell.com>
---
 automated install/uninstall.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/automated install/uninstall.sh b/automated install/uninstall.sh
index b58c3ecb..2bcf66bb 100755
--- a/automated install/uninstall.sh	
+++ b/automated install/uninstall.sh	
@@ -60,17 +60,17 @@ if [ -x "$(command -v apt-get)" ]; then
 		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
+		"${SUDO} ${PKG_MANAGER}" -y autoremove
+		"${SUDO} ${PKG_MANAGER}" -y autoclean
 	}
 elif [ -x "$(command -v rpm)" ]; then
 	# Fedora Family
 	PKG_REMOVE="${PKG_MANAGER} remove -y"
 	package_check() {
-		rpm -qa | grep ^$1- > /dev/null
+		rpm -qa | grep "^$1-" > /dev/null
 	}
 	package_cleanup() {
-		${SUDO} ${PKG_MANAGER} -y autoremove
+		"${SUDO} ${PKG_MANAGER}" -y autoremove
 	}
 else
   echo -e "  ${CROSS} OS distribution not supported"