aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlkoeller <lkoeller@FreeBSD.org>2004-12-14 02:28:29 +0800
committerlkoeller <lkoeller@FreeBSD.org>2004-12-14 02:28:29 +0800
commit335ecf579b72fd3fd28193ae6174a9a8f186a33d (patch)
tree5f6149f9d981d9e4ed0fb9e1dd43433744df83d9
parente932028c197f7be215451033fd0ca9d0bc5e0ede (diff)
downloadfreebsd-ports-gnome-335ecf579b72fd3fd28193ae6174a9a8f186a33d.tar.gz
freebsd-ports-gnome-335ecf579b72fd3fd28193ae6174a9a8f186a33d.tar.zst
freebsd-ports-gnome-335ecf579b72fd3fd28193ae6174a9a8f186a33d.zip
o) Don't report deinstall message (manually deletion of directory)
if it's useless, i.e. the dir could be removed automatically. Submitted by: Kris Kennaway <kris@obsecurity.org>
-rw-r--r--sysutils/bacula-server/files/pkg-deinstall.client.in7
-rw-r--r--sysutils/bacula-server/pkg-deinstall8
-rw-r--r--sysutils/bacula-server/pkg-deinstall.client7
3 files changed, 19 insertions, 3 deletions
diff --git a/sysutils/bacula-server/files/pkg-deinstall.client.in b/sysutils/bacula-server/files/pkg-deinstall.client.in
index a3c5e5a1ba2e..cadbda56ab93 100644
--- a/sysutils/bacula-server/files/pkg-deinstall.client.in
+++ b/sysutils/bacula-server/files/pkg-deinstall.client.in
@@ -14,6 +14,11 @@ case "$2" in
-e '}' /etc/services > $TMPFILE
mv -f $TMPFILE /etc/services
- echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port"
+ if [ -d ${BACULA_DIR} ]; then
+ rmdir ${BACULA_DIR};
+ fi
+ if [ -d ${BACULA_DIR} ]; then
+ echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port"
+ fi
;;
esac
diff --git a/sysutils/bacula-server/pkg-deinstall b/sysutils/bacula-server/pkg-deinstall
index 28189213142e..3af061509188 100644
--- a/sysutils/bacula-server/pkg-deinstall
+++ b/sysutils/bacula-server/pkg-deinstall
@@ -14,13 +14,19 @@ case "$2" in
-e '}' /etc/services > $TMPFILE
mv -f $TMPFILE /etc/services
+ if [ -d ${BACULA_DIR} ]; then
+ rmdir ${BACULA_DIR};
+ fi
+ if [ -d ${BACULA_DIR} ]; then
+ echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port"
+ fi
+
# Note how to delete UID/GID
USER=bacula
GROUP=${USER}
if pw usershow "${USER}" 2>/dev/null 1>&2; then
echo "To delete Bacula user permanently, use 'pw userdel ${USER}'"
echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
- echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the port"
fi
;;
esac
diff --git a/sysutils/bacula-server/pkg-deinstall.client b/sysutils/bacula-server/pkg-deinstall.client
index a3c5e5a1ba2e..cadbda56ab93 100644
--- a/sysutils/bacula-server/pkg-deinstall.client
+++ b/sysutils/bacula-server/pkg-deinstall.client
@@ -14,6 +14,11 @@ case "$2" in
-e '}' /etc/services > $TMPFILE
mv -f $TMPFILE /etc/services
- echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port"
+ if [ -d ${BACULA_DIR} ]; then
+ rmdir ${BACULA_DIR};
+ fi
+ if [ -d ${BACULA_DIR} ]; then
+ echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port"
+ fi
;;
esac