[Devil-linux-commit] build/scripts functions,1.42,1.43

[<smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv16961/scripts

Modified Files:
	functions 
Log Message:
"list" was broken


Index: functions
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/functions,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- functions	17 Dec 2003 14:55:47 -0000	1.42
+++ functions	19 Dec 2003 14:09:06 -0000	1.43
@@ -136,12 +136,20 @@
 # parameters: menu type text variable
 function menu_add ()
 {
+	eval SET=\$$4
+	TYPE=$2
+	TEXT=$3
+	VARIABLE=$4
+
 	MENU=""
 	MENUOLD=""
 	X="Main|${1// /___}"
 	Y=${X//|/^}
 	if [ -n "${Y%$CURRENTMENU*}" ]; then
-		return
+		Y="$Y^$VARIABLE"
+		if [ -n "${Y%$CURRENTMENU*}" ]; then
+			return
+		fi
 	fi
 
 	X="Main|${1// /___}"
@@ -184,11 +192,6 @@
 				"\\" > "$WORKDIR/.menu$MENU"
 		fi
 	done
-
-	eval SET=\$$4
-	TYPE=$2
-	TEXT=$3
-	VARIABLE=$4
 
 	X=${X//|/^}