From 32060212787f2ac5222ef113c69f6aa0e57a236f Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 4 Oct 2014 13:50:39 -0700 Subject: [PATCH] Another round of uninstall fixes Signed-off-by: Tom Eastep --- Shorewall-init/uninstall.sh | 2 +- Shorewall-lite/uninstall.sh | 2 +- Shorewall/uninstall.sh | 2 +- Shorewall6-lite/uninstall.sh | 2 +- Shorewall6/uninstall.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh index df72cce9f..c51272112 100755 --- a/Shorewall-init/uninstall.sh +++ b/Shorewall-init/uninstall.sh @@ -203,7 +203,7 @@ if [ -d ${CONFDIR}/ppp ]; then fi rm -rf ${SHAREDIR}/shorewall-init -rm -rf ${LIBEXEC}/shorewall-init +rm -rf ${LIBEXECDIR}/shorewall-init echo "Shorewall Init Uninstalled" diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index 3759413e3..2820fbf0a 100755 --- a/Shorewall-lite/uninstall.sh +++ b/Shorewall-lite/uninstall.sh @@ -191,7 +191,7 @@ rm -f ${SBINDIR}/shorewall-lite rm -rf ${CONFDIR}/shorewall-lite rm -rf ${VARDIR}/shorewall-lite rm -rf ${SHAREDIR}/shorewall-lite -rm -rf ${LIBEXEC}/shorewall-lite +rm -rf ${LIBEXECDIR}/shorewall-lite rm -f ${CONFDIR}/logrotate.d/shorewall-lite rm -f ${MANDIR}/man5/shorewall-lite* diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index ace6a12ff..c1dce12fd 100755 --- a/Shorewall/uninstall.sh +++ b/Shorewall/uninstall.sh @@ -197,7 +197,7 @@ fi rm -rf ${VARDIR}/shorewall rm -rf ${PERLLIBDIR}/Shorewall/* -rm -rf ${LIBEXEC}/shorewall +rm -rf ${LIBEXECDIR}/shorewall rm -rf ${SHAREDIR}/shorewall/configfiles/ rm -rf ${SHAREDIR}/shorewall/Samples/ rm -rf ${SHAREDIR}/shorewall/Shorewall/ diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index cdff32790..2aac00e23 100755 --- a/Shorewall6-lite/uninstall.sh +++ b/Shorewall6-lite/uninstall.sh @@ -188,7 +188,7 @@ rm -f ${SBINDIR}/shorewall6-lite rm -rf ${CONFDIR}/shorewall6-lite rm -rf ${VARDIR}/shorewall6-lite rm -rf ${SHAREDIR}/shorewall6-lite -rm -rf ${LIBEXEC}/shorewall6-lite +rm -rf ${LIBEXECDIR}/shorewall6-lite rm -f ${CONFDIR}/logrotate.d/shorewall6-lite [ -n "$SYSTEMD" ] && rm -f ${SYSTEMD}/shorewall6-lite.service diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index 9f1fac48a..f710ee7bb 100755 --- a/Shorewall6/uninstall.sh +++ b/Shorewall6/uninstall.sh @@ -186,7 +186,7 @@ fi rm -f ${SBINDIR}/shorewall6 rm -rf ${CONFDIR}/shorewall6 rm -rf ${VARDIR}/shorewall6 -rm -rf ${LIBEXEC}/shorewall6 +rm -rf ${LIBEXECDIR}/shorewall6 rm -rf ${SHAREDIR}/shorewall6 for f in ${MANDIR}/man5/shorewall6* ${SHAREDIR}/man/man8/shorewall6*; do