[Cdd-commits] cdd/common/cdd/templates apt.conf,1.2,1.3 postinst,1.13,1.14 postrm,1.7,1.8

[Andreas Tille]

Update of /cvsroot/cdd/cdd/common/cdd/templates
In directory haydn:/tmp/cvs-serv7599/cdd/templates

Modified Files:
	apt.conf postinst postrm 
Log Message:
Fixed behaviour on removal of meta packages.


Index: postrm
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/templates/postrm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- postrm	26 Jun 2004 07:07:54 -0000	1.7
+++ postrm	27 Jun 2004 12:27:39 -0000	1.8
@@ -1,18 +1,38 @@
 #!/bin/bash -e
 
-## Echoing breaks debconf! 
-## echo "Removing package #PKG#."
 test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD# 
 
-source /etc/cdd/cdd.conf
-if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then source /etc/cdd/#CDD#/#CDD#.conf ; fi
-if [ "${UPDATEUSERMENU}" = "yes" ] ; then
-        for ROLE in `getCDDRoleList #CDD#`; do
-                for CDDUSER in `getUsersInRole #CDD# ${ROLE}`; do
-                        echo "Adding menu for user ${CDDUSER} of #CDD# ..."
-                        su ${CDDUSER} -c "update-menus"
-                done
-        done
+test -s /etc/cdd/cdd.conf         && . /etc/cdd/cdd.conf
+test -s /etc/cdd/#CDD#/#CDD#.conf && . /etc/cdd/#CDD#/#CDD#.conf
+
+
+if [ -x /usr/sbin/cdd-update-usermenus ] ; then
+    . /usr/share/debconf/confmodule
+    db_version 2.0
+
+    . /etc/cdd/cdd.conf
+    if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then . /etc/cdd/#CDD#/#CDD#.conf ; fi
+
+    case "$1" in
+	abort-install|abort-upgrade|failed-upgrade)
+	    ;;
+	remove|purge)
+	    db_get "shared/#CDD#-common/usermenus" || true
+	    case "$RET" in
+		now)
+		    /usr/sbin/cdd-update-usermenus #CDD#
+		    ;;
+		end)
+		    touch /var/run/#CDD#-common.usermenu
+		    ;;
+	    esac
+	    ;;
+	*)
+	    echo "postinst called with unknown argument \`$1'" >&2
+	    exit 1
+	    ;;
+    esac
 fi
+
 
 #DEBHELPER#

Index: postinst
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/templates/postinst,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- postinst	26 Jun 2004 22:03:21 -0000	1.13
+++ postinst	27 Jun 2004 12:27:39 -0000	1.14
@@ -1,7 +1,5 @@
 #!/bin/bash -e
 
-## Echoing breaks debconf!
-## echo "Installing package #PKG#."
 test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD#
 
 . /usr/share/debconf/confmodule

Index: apt.conf
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/templates/apt.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- apt.conf	26 Jun 2004 22:03:21 -0000	1.2
+++ apt.conf	27 Jun 2004 12:27:39 -0000	1.3
@@ -6,5 +6,5 @@
  */
 
 DPkg {
-	Post-Invoke {"test -f /var/run/#CDD#-common.usermenu && /usr/sbin/cdd-update-usermenus #CDD# ; rm -f /var/run/#CDD#-common.usermenu";};
+	Post-Invoke {"test -f /var/run/#CDD#-common.usermenu && if [ -x /usr/sbin/cdd-update-usermenus ] ; then /usr/sbin/cdd-update-usermenus #CDD# ; fi ; rm -f /var/run/#CDD#-common.usermenu";};
 }