[Lunar-commits] CVS: theedge/sbin lin,1.71,1.72

[Auke Kok]

Update of /var/cvs/lunar/theedge/sbin
In directory dbguin.lunar-linux.org:/tmp/cvs-serv6251/sbin

Modified Files:
	lin 
Log Message:
cosmetic cleanups for mod_v stuff, xterm_msg code, hardkrash' config etc, 
pipelining improved for lin, this is a long pending improvement that was needed,
another addition to moonbase installs, one that helps on clean or taken-over boxes,
clear msg for MAKES optimize question field


Index: lin
===================================================================
RCS file: /var/cvs/lunar/theedge/sbin/lin,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- lin	11 Jan 2004 22:25:11 -0000	1.71
+++ lin	23 Feb 2004 21:15:53 -0000	1.72
@@ -60,7 +60,7 @@
   debug_msg "main ($@)"
   MODULES="$@"
 
-  message "mod_v = $MOD_VERSION mod= $MODULES"
+  verbose_msg "mod_v=\"$MOD_VERSION\" mod=\"$MODULES\""
 
   if echo $MODULES | grep -qw moonbase ; then
     
@@ -82,7 +82,7 @@
 
   # different approaches for multiple modules (start up downloads first)
   # and single modules (plain install)
-  if [ $(echo $MODULES | wc -w) -gt 1 ] ; then
+  if [ -z "$SINGLE_MODULE" ] ; then
 
     if [ -n "$MOD_VERSION" ] ; then
       message "${MESSAGE_COLOR} -V|--Version only allowed for single-module install!${DEFAULT_COLOR}"
@@ -118,15 +118,12 @@
     # pass 3 : compile/install
     # no strange stuff should happen here anymore
     for MODULE in $MODULES ; do
-      verbose_msg "starting installation of \"$MODULE\""
       if ! module_installed $MODULE || [ ! -n "$PROBE" ] ; then
         if ! module_held $MODULE ; then
           linING="/var/lock/installing.$MODULE"
-          if  [  -n  "$COMPILE"      ]  ||
-              [  -n  "$RECONFIGURE"  ]  ||
-              module_installed  $MODULE   ||
-              !  resurrect     $MODULE;  then
-            if ! lin $DEPS_ONLY $RECONFIGURE $COMPILE $PROBE $SILENT $MODULE ; then
+          if [ -n "$COMPILE" ] || [ -n "$RECONFIGURE" ] || module_installed $MODULE || ! resurrect $MODULE ; then
+	    verbose_msg "starting lin \"$MODULE\""
+            if ! SINGLE_MODULE=1 lin $DEPS_ONLY $RECONFIGURE $COMPILE $PROBE $SILENT $MODULE ; then
               if [ -e "$TMP_LIN_FAIL" ] ; then
                 echo "$MODULE" >> $TMP_LIN_FAIL
               fi
@@ -148,24 +145,24 @@
     temp_destroy $TEMP_PREPAREDDEPS
 
   else
-    if [ -n "$MOD_VERSION" ] ; then
+    # we are only doing one module, drop down to:
+    MODULE=$MODULES
 
-      if  echo $MODULES | grep -q '/' ; then
-        if [ -d ${MOONBASE}/*/${MODULES} ] ; then
+    if [ -n "$MOD_VERSION" ] ; then
+      if echo $MODULE | grep -q '/' ; then
+        if [ -d ${MOONBASE}/*/${MODULE} ] ; then
 	  unset MOD_VERSION
         else
-          message "${PROBLEM_COLOR}No Moonbase module:${FILE_COLOR}$MODULES${MESSAGE_COLOR}\
-	            with $MODULES form, bailing!${DEFAULT_COLOR}"
+          message "${PROBLEM_COLOR}No Moonbase module: ${FILE_COLOR}$MODULE${MESSAGE_COLOR} with \"$MODULE\" form, bailing!${DEFAULT_COLOR}"
 	  return 1
         fi
       else
-	if [ -d ${MOONBASE}/*/${MODULES}/${MOD_VERSION} ] ; then
-	  MODULES="${MODULES}/${MOD_VERSION}"
+	if [ -d ${MOONBASE}/*/${MODULE}/${MOD_VERSION} ] ; then
+	  MODULE="${MODULE}/${MOD_VERSION}"
 	else
-          message "${MESSAGE_COLOR}$MODULES Passing${FILE_COLOR} $MOD_VERSION${MESSAGE_COLOR}\
-	          to module for processing${DEFAULT_COLOR}"
+          debug_msg "${MESSAGE_COLOR}$MODULES Passing ${FILE_COLOR}$MOD_VERSION${MESSAGE_COLOR} to module for processing${DEFAULT_COLOR}"
         fi
-	message "Module = $MODULES"
+	message "Module=\"$MODULE\""
       fi
     fi
 
@@ -173,8 +170,7 @@
       FLAG_PREPAREDDEPS_SET=on
       export TEMP_PREPAREDDEPS=$(temp_create "prepared-depends")
     fi
-    # we are only doing one module, drop down to:
-    MODULE=$MODULES
+
     if ! module_held $MODULE ; then
       if [ -n "$PROBE" ] ; then
         if ! module_installed $MODULE ; then