From daff0ed748c9e6625d10430789448d64b540af1a Mon Sep 17 00:00:00 2001 From: Lars Koeller Date: Mon, 13 Dec 2004 18:28:29 +0000 Subject: 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 --- sysutils/bacula-server/files/pkg-deinstall.client.in | 7 ++++++- sysutils/bacula-server/pkg-deinstall | 8 +++++++- sysutils/bacula-server/pkg-deinstall.client | 7 ++++++- 3 files changed, 19 insertions(+), 3 deletions(-) (limited to 'sysutils') 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 -- cgit v1.2.3