summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-06-27 20:43:44 +0000
committerjlam <jlam@pkgsrc.org>2002-06-27 20:43:44 +0000
commit66973002114006af3a15c108a6caa4240108435d (patch)
treee167b0fda45c0204df1ad73930d20b4ce833a420
parentce7c65ef99e9b376a525033814effec1855b02e7 (diff)
downloadpkgsrc-66973002114006af3a15c108a6caa4240108435d.tar.gz
Don't bother the admin about the ${PKG_SYSCONFBASE} and ${RCD_SCRIPTS_DIR}
directories if they still exist after we try to remove them.
-rw-r--r--mk/install/deinstall18
1 files changed, 14 insertions, 4 deletions
diff --git a/mk/install/deinstall b/mk/install/deinstall
index acf2510a70c..ffd4e1b82a1 100644
--- a/mk/install/deinstall
+++ b/mk/install/deinstall
@@ -1,6 +1,6 @@
# start of deinstall
#
-# $NetBSD: deinstall,v 1.9 2002/06/20 20:15:50 jlam Exp $
+# $NetBSD: deinstall,v 1.10 2002/06/27 20:43:44 jlam Exp $
eval set -- ${PKG_USERS}
for userset; do
@@ -124,9 +124,19 @@ POST-DEINSTALL)
${RMDIR} -p "${dir}" 2>/dev/null || ${TRUE}
;;
esac
- if [ -d "${dir}" ]; then
- existing_dirs="${existing_dirs} \"${dir}\""
- fi
+ case "${dir}" in
+ #
+ # Don't bother the admin about the following dirs
+ # if they still exist.
+ #
+ ${PKG_SYSCONFBASE}|${RCD_SCRIPTS_DIR})
+ ;;
+ *)
+ if [ -d "${dir}" ]; then
+ existing_dirs="${existing_dirs} \"${dir}\""
+ fi
+ ;;
+ esac
fi
done