diff options
| author | Lars Koeller <lkoeller@FreeBSD.org> | 2004-12-13 18:28:29 +0000 |
|---|---|---|
| committer | Lars Koeller <lkoeller@FreeBSD.org> | 2004-12-13 18:28:29 +0000 |
| commit | daff0ed748c9e6625d10430789448d64b540af1a (patch) | |
| tree | db8cf6b883c0cec6949714f457fd00ee63163832 /sysutils/bacula-server | |
| parent | - Fix ipfw parser on FreeBSD 4.x (diff) | |
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>
Notes
Notes:
svn path=/head/; revision=123943
Diffstat (limited to 'sysutils/bacula-server')
| -rw-r--r-- | sysutils/bacula-server/files/pkg-deinstall.client.in | 7 | ||||
| -rw-r--r-- | sysutils/bacula-server/pkg-deinstall | 8 | ||||
| -rw-r--r-- | sysutils/bacula-server/pkg-deinstall.client | 7 |
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 |