[Devil-linux-commit] build/scripts functions,1.47,1.48 menuconfig,1.29,1.30

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

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

Modified Files:
	functions menuconfig 
Log Message:
- menuconfig now correctly sets any missing list values in the config file


Index: functions
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/functions,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- functions	11 Jan 2004 14:43:04 -0000	1.47
+++ functions	11 Jan 2004 15:17:01 -0000	1.48
@@ -141,6 +141,14 @@
 	TEXT=$3
 	VARIABLE=$4
 
+	echo $VARIABLE >> $WORKDIR/.menuok
+
+	if [ "$TYPE" = "list" ];then
+		if [ -z "$(grep "$VARIABLE=" $BUILD_CONFIG-tmp 2> /dev/null)" ];then
+			echo $VARIABLE=$SET >> $BUILD_CONFIG-tmp
+		fi
+	fi
+
 	MENU=""
 	MENUOLD=""
 	X="Main|${1// /___}"
@@ -238,7 +246,6 @@
 				;;
 		esac
 	fi
-	echo $VARIABLE >> $WORKDIR/.menuok
 }
 
 menu_display ()

Index: menuconfig
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/menuconfig,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- menuconfig	11 Jan 2004 14:43:04 -0000	1.29
+++ menuconfig	11 Jan 2004 15:17:02 -0000	1.30
@@ -102,7 +102,7 @@
 			VALUE=$(echo $CHOICE | cut -f 3 -d " " )
 			case $TYPE in
 				bool )
-					grep -v $VAR $BUILD_CONFIG-tmp >> $BUILD_CONFIG-tmp2
+					grep -v "$VAR=" $BUILD_CONFIG-tmp >> $BUILD_CONFIG-tmp2
 					cp $BUILD_CONFIG-tmp2 $BUILD_CONFIG-tmp
 					rm $BUILD_CONFIG-tmp2
 					eval SET=\$$VAR
@@ -115,7 +115,7 @@
 					;;
 
 				listsel )
-					grep -v $VAR $BUILD_CONFIG-tmp >> $BUILD_CONFIG-tmp2
+					grep -v "$VAR=" $BUILD_CONFIG-tmp >> $BUILD_CONFIG-tmp2
 					cp $BUILD_CONFIG-tmp2 $BUILD_CONFIG-tmp
 					rm $BUILD_CONFIG-tmp2
 					echo $VAR=$VALUE >> $BUILD_CONFIG-tmp