[Commits] CVS: theedge/sbin lin,1.60,1.61 lunar,1.19,1.20

[sofar at lunar-linux.org]

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

Modified Files:
	lin lunar 
Log Message:
Bugfixes and cleanups.
Adding ZLOCAL_OVERRIDE if you want modules in zlocal to override the moonbase ones (NOT RECOMMENDED)
Pathetically scanning if statements for empty arguments
committing SOURCE_VFY syntax... SOURCE_MD5 syntax is dead as of now in theedge... gpg lives!

shite I fergot the rest.

QOTD:
A bureaucrat's idea of cleaning up his files is to make a copy of everything
before he destroys it.


Index: lin
===================================================================
RCS file: /var/cvs/lunar/theedge/sbin/lin,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- lin	28 Jul 2003 21:51:51 -0000	1.60
+++ lin	4 Aug 2003 23:19:42 -0000	1.61
@@ -117,8 +117,6 @@
 }
 
 
-
-
 main()	{
   process_parameters $@
   MODULES=$(strip_parameters $@)
@@ -204,7 +202,7 @@
       temp_destroy $TEMP_PREPAREDDEPS
 
     else
-      if [ ! -n "$TEMP_PREPAREDDEPS" ] ; then
+      if [ -z "$TEMP_PREPAREDDEPS" ] ; then
         FLAG_PREPAREDDEPS_SET=on
         export TEMP_PREPAREDDEPS=$(temp_create "prepared-depends")
       fi
@@ -216,6 +214,7 @@
 	    build_depends $MODULE &&
 	    if [ ! -n "$DEPS_ONLY" ] ; then
 	      if ! lin_module $MODULE ; then
+                temp_destroy $TEMP_PREPAREDDEPS
 	        exit 1
               fi
 	    fi
@@ -224,6 +223,7 @@
 	  build_depends $MODULE &&
 	  if [ ! -n "$DEPS_ONLY" ] ; then
             if ! lin_module $MODULE ; then
+              temp_destroy $TEMP_PREPAREDDEPS
 	      exit 1
 	    fi
 	  fi

Index: lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/sbin/lunar,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- lunar	20 Jul 2003 17:18:02 -0000	1.19
+++ lunar	4 Aug 2003 23:19:42 -0000	1.20
@@ -486,6 +486,7 @@
   U_HELP="Automatically remove old sources and install caches upon lunar update?"
   V_HELP="View compilation as it happens?"
   W_HELP="Verbose display of compilation process?"
+  Z_HELP="Custom modules in zlocal override equally named ones (NOT RECOMMENDED) ?"
 
          ARCHIVE=${ARCHIVE:=on}
    AUTORESURRECT=${AUTORESURRECT:=on}
@@ -515,23 +516,24 @@
                         --checklist             \
                         ""                      \
                         0 40 14                 \
-      "ARCHIVE"       "Toggle"  "$ARCHIVE"       "$I_HELP"   \
-      "AUTORESURRECT" "Toggle"  "$AUTORESURRECT" "$H_HELP"   \
-      "AUTOFIX"       "Toggle"  "$AUTOFIX"       "$F_HELP"   \
-      "AUTOPRUNE"     "Toggle"  "$AUTOPRUNE"     "$U_HELP"   \
-      "CABAL"         "Toggle"  "$CABAL"         "$B_HELP"   \
-      "COLOR"         "Toggle"  "$COLOR"         "$C_HELP"   \
-      "KEEP_SOURCE"   "Toggle"  "$KEEP_SOURCE"   "$K_HELP"   \
-      "GARBAGE"       "Toggle"  "$GARBAGE"       "$G_HELP"   \
-      "MAIL_REPORTS"  "Toggle"  "$MAIL_REPORTS"  "$M_HELP"   \
-      "PRESERVE"      "Toggle"  "$PRESERVE"      "$P_HELP"   \
-      "SOUND"         "Toggle"  "$SOUND"         "$S_HELP"   \
-      "SUSTAIN"       "Toggle"  "$SUSTAIN"       "$T_HELP"   \
-      "VIEW_REPORTS"  "Toggle"  "$VIEW_REPORTS"  "$R_HELP"   \
-      "VOYEUR"        "Toggle"  "$VOYEUR"        "$V_HELP"   \
-      "REAP"          "Toggle"  "$REAP"          "$E_HELP"   \
-      "TMPFS"         "Toggle"  "$TMPFS"         "$D_HELP"   \
-      "VERBOSE"       "Toggle"  "$VERBOSE"       "$W_HELP"`
+      "ARCHIVE"          "Toggle"  "$ARCHIVE"       "$I_HELP"   \
+      "AUTORESURRECT"    "Toggle"  "$AUTORESURRECT" "$H_HELP"   \
+      "AUTOFIX"          "Toggle"  "$AUTOFIX"       "$F_HELP"   \
+      "AUTOPRUNE"        "Toggle"  "$AUTOPRUNE"     "$U_HELP"   \
+      "CABAL"            "Toggle"  "$CABAL"         "$B_HELP"   \
+      "COLOR"            "Toggle"  "$COLOR"         "$C_HELP"   \
+      "KEEP_SOURCE"      "Toggle"  "$KEEP_SOURCE"   "$K_HELP"   \
+      "GARBAGE"          "Toggle"  "$GARBAGE"       "$G_HELP"   \
+      "MAIL_REPORTS"     "Toggle"  "$MAIL_REPORTS"  "$M_HELP"   \
+      "PRESERVE"         "Toggle"  "$PRESERVE"      "$P_HELP"   \
+      "SOUND"            "Toggle"  "$SOUND"         "$S_HELP"   \
+      "SUSTAIN"          "Toggle"  "$SUSTAIN"       "$T_HELP"   \
+      "VIEW_REPORTS"     "Toggle"  "$VIEW_REPORTS"  "$R_HELP"   \
+      "VOYEUR"           "Toggle"  "$VOYEUR"        "$V_HELP"   \
+      "REAP"             "Toggle"  "$REAP"          "$E_HELP"   \
+      "TMPFS"            "Toggle"  "$TMPFS"         "$D_HELP"   \
+      "VERBOSE"          "Toggle"  "$VERBOSE"       "$W_HELP"   \
+      "ZLOCAL_OVERRIDES" "Toggle"  "$ZLOCAL_OVERRIDES" "$Z_HELP"`
 
   then
   
@@ -552,6 +554,7 @@
          GARBAGE=off
            TMPFS=off
 	 VERBOSE=off
+ZLOCAL_OVERRIDES=off
 
     for  TOGGLE  in  $TOGGLES;  do
       case  $TOGGLE  in
@@ -572,6 +575,7 @@
              GARBAGE)       GARBAGE=on  ;;
                TMPFS)         TMPFS=on  ;;
 	     VERBOSE)       VERBOSE=on  ;;
+    ZLOCAL_OVERRIDES) ZLOCAL_OVERRIDES=on ;;
       esac
     done
 
@@ -592,7 +596,8 @@
           grep  -v  "GARBAGE="       |
           grep  -v  "color"          |
           grep  -v  "TMPFS="         |
-	  grep  -v  "VERBOSE="`
+	  grep  -v  "VERBOSE="       |
+	  grep  -v  "ZLOCAL_OVERRIDES="`
 
     echo  "$TEMP"                        >   $LOCAL_CONFIG
     echo  "      ARCHIVE=$ARCHIVE"       >>  $LOCAL_CONFIG
@@ -612,6 +617,7 @@
     echo  "        color $COLOR"         >>  $LOCAL_CONFIG
     echo  "        TMPFS=$TMPFS"         >>  $LOCAL_CONFIG
     echo  "      VERBOSE=$VERBOSE"       >>  $LOCAL_CONFIG
+    echo  "ZLOCAL_OVERRIDES=$ZLOCAL_OVERRIDES" >> $LOCAL_CONFIG
   fi
 }