From 44142ed45712b572b581ebcbf2132727fa494d8d Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 2 Apr 2015 07:27:57 -0700
Subject: [PATCH] Apply Matt Darfeuille's uninstall fixes

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/uninstall.sh  | 2 +-
 Shorewall6/uninstall.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh
index c1dce12fd..1e4a668ed 100755
--- a/Shorewall/uninstall.sh
+++ b/Shorewall/uninstall.sh
@@ -197,7 +197,7 @@ fi
 
 rm -rf ${VARDIR}/shorewall
 rm -rf ${PERLLIBDIR}/Shorewall/*
-rm -rf ${LIBEXECDIR}/shorewall
+[ ${LIBEXECDIR} = ${SHAREDIR} ] || rm -rf ${LIBEXECDIR}/shorewall
 rm -rf ${SHAREDIR}/shorewall/configfiles/
 rm -rf ${SHAREDIR}/shorewall/Samples/
 rm -rf ${SHAREDIR}/shorewall/Shorewall/
diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh
index f710ee7bb..111d388da 100755
--- a/Shorewall6/uninstall.sh
+++ b/Shorewall6/uninstall.sh
@@ -136,7 +136,7 @@ else
     usage 1
 fi
 
-if [ -f ${SHARDIR}/shorewall6/version ]; then
+if [ -f ${SHAREDIR}/shorewall6/version ]; then
     INSTALLED_VERSION="$(cat /usr/share/shorewall6/version)"
     if [ "$INSTALLED_VERSION" != "$VERSION" ]; then
 	echo "WARNING: Shorewall6 Version $INSTALLED_VERSION is installed"