[Cdd-commits] cdd/common/cdd/share/cdd/menu cdd-menu,1.7,1.8

[Andreas Tille]

Update of /cvsroot/cdd/cdd/common/cdd/share/cdd/menu
In directory haydn:/tmp/cvs-serv5552/cdd/share/cdd/menu

Modified Files:
	cdd-menu 
Log Message:
Preparation for next release.


Index: cdd-menu
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/share/cdd/menu/cdd-menu,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cdd-menu	3 Jun 2004 21:12:59 -0000	1.7
+++ cdd-menu	26 Jun 2004 22:03:21 -0000	1.8
@@ -12,6 +12,7 @@
 
 CONFBASE=${CONFBASE:-/etc/cdd}
 
+# read generic CDD conf
 source ${CONFBASE}/cdd.conf
 
 CDDUSER=`whoami`
@@ -21,8 +22,7 @@
 
 ALLCDD=`getCDDList`
 for CDD in ${ALLCDD}; do
-	# read generic and per CDD conf
-	source ${CONFBASE}/cdd.conf
+	# read per CDD conf
 	test -f  ${CONFBASE}/${CDD}/${CDD}.conf && \
 		source ${CONFBASE}/${CDD}/${CDD}.conf