pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/shared-mime-info databases/share-mime-info: ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/103c913da13d
branches:  trunk
changeset: 594497:103c913da13d
user:      marino <marino%pkgsrc.org@localhost>
date:      Sat Oct 29 13:20:54 2011 +0000

description:
databases/share-mime-info: Improve DEINSTALL script

Fixes the following issue:

> pkg_delete shared-mime-info-0.90nb1
rmdir: /usr/pkg/share/mime/packages: No such file or directory

diffstat:

 databases/shared-mime-info/DEINSTALL |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 9fc133c33b83 -r 103c913da13d databases/shared-mime-info/DEINSTALL
--- a/databases/shared-mime-info/DEINSTALL      Sat Oct 29 11:40:46 2011 +0000
+++ b/databases/shared-mime-info/DEINSTALL      Sat Oct 29 13:20:54 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.3 2008/10/31 14:02:18 wiz Exp $
+# $NetBSD: DEINSTALL,v 1.4 2011/10/29 13:20:54 marino Exp $
 
 MIMEDB_PATH="@MIMEDB_PATH@"
 
@@ -6,7 +6,15 @@
 POST-DEINSTALL)
        (cd ${MIMEDB_PATH} && \
         ${LS} . | ${GREP} -v '^packages$' | ${XARGS} ${RM} -rf)
-       ${RMDIR} ${MIMEDB_PATH}/packages || ${TRUE}
-       ${RMDIR} ${MIMEDB_PATH} || ${TRUE}
+       if [ -d ${MIMEDB_PATH}/packages ]; then
+         if [ -n `${LS} -A ${MIMEDB_PATH}/packages` ]; then
+           ${RMDIR} ${MIMEDB_PATH}/packages
+         fi
+       fi
+       if [ -d ${MIMEDB_PATH} ]; then
+         if [ -n `${LS} -A ${MIMEDB_PATH}` ]; then
+           ${RMDIR} ${MIMEDB_PATH}
+         fi
+       fi
        ;;
 esac



Home | Main Index | Thread Index | Old Index