CVS: theedge/sbin lin,1.55,1.56 lrm,1.13,1.14 lunar,1.17,1.18

[sofar at lunar-linux.org]

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

Modified Files:
	lin lrm lunar 
Log Message:
Preliminary bugrelease, fixing hopefully the wrong strings in the updatelog, fixing the failed reports bug, and several other improvments that were quite needed.


Index: lin
===================================================================
RCS file: /var/cvs/lunar/theedge/sbin/lin,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- lin	14 Jul 2003 07:33:14 -0000	1.55
+++ lin	14 Jul 2003 22:38:20 -0000	1.56
@@ -122,7 +122,6 @@
   if echo $MODULES | grep -qw moonbase ; then
     # just update moonbase, no other modules
     get_moonbase
-
     # remove moonbase rofm MODULES and continue
     MODULES=$(echo $MODULES | sed 's/moonbase//g')
     if [ -z "$MODULES" ] ; then

Index: lrm
===================================================================
RCS file: /var/cvs/lunar/theedge/sbin/lrm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- lrm	13 Jul 2003 20:49:54 -0000	1.13
+++ lrm	14 Jul 2003 22:38:20 -0000	1.14
@@ -192,7 +192,7 @@
       INST_LOG=$INSTALL_LOGS/$MODULE-$VERSION
        MD5_LOG=$MD5SUM_LOGS/$MODULE-$VERSION
 
-      run_module_file PRE_REMOVE 
+      run_module_file $MODULE PRE_REMOVE 
 
       while read TARGET ; do
          if ! [ -e "$TARGET" ] ; then
@@ -217,7 +217,7 @@
 
       process_directories $TEMP_FILE $TEMP2_FILE
 
-      run_module_file POST_REMOVE
+      run_module_file $MODULE POST_REMOVE
 
       if [ "$KEEPCONFIG" == "on" ] ; then
         verbose_msg "skipping removal of dependency listing and configs"

Index: lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/sbin/lunar,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- lunar	13 Jul 2003 20:49:54 -0000	1.17
+++ lunar	14 Jul 2003 22:38:20 -0000	1.18
@@ -128,27 +128,22 @@
 
 
 show_installed_modules()  {
-  for  LINE  in  `sort  $MODULE_STATUS_BACKUP`;  do
-     MODULE=`echo  "$LINE"    |  cut  -d : -f1`
-     STATUS=`echo  "$LINE"    |  cut  -d : -f3`
-    VERSION=`echo  "$LINE"    |  cut  -d : -f4`
-       SIZE=`echo  "$LINE"    |  cut  -d : -f5`
+  for LINE in $(sort  $MODULE_STATUS_BACKUP) ; do
+  (
+     MODULE=`echo "$LINE" | cut -d : -f1`
+     STATUS=`echo "$LINE" | cut -d : -f3`
+    VERSION=`echo "$LINE" | cut -d : -f4`
+       SIZE=`echo "$LINE" | cut -d : -f5`
 	
-    if  [  "$STATUS"  ==  "installed"  ]  ||
-        [  "$STATUS"  ==  "held"       ];  then
-		
-       [ -n "$SIZE" ] && SIZE=", $SIZE"
-
-        SHORT="Short Description Unavailable"
-      SECTION=`find_section  $MODULE`
-
-      [  -x  $MOONBASE/$SECTION/$MODULE/DETAILS  ]  &&
-           . $MOONBASE/$SECTION/$MODULE/DETAILS  >  /dev/null
-
-      echo  "$MODULE"
-      echo  "$VERSION$SIZE"
-      echo  "$SHORT"
+    # TODO THIS IS BROKEN
+    if module_installed $MODULE ; then
+      SHORT="Short Description Unavailable"
+      run_module_file $MODULE DETAILS &> /dev/null
+      echo -e "$MODULE\n"
+      echo -e "$VERSION,$SIZE\n"
+      echo -e "\"$SHORT\"\n"
     fi
+  )
   done
 }
 
@@ -157,10 +152,10 @@
   while
     if  [  -z  "$INSTALLED_MODULES"  ];  then
       echo  "Discovering installed modules..."
-      INSTALLED_MODULES=`show_installed_modules`
+      INSTALLED_MODULES=$(show_installed_modules)
     fi
 
-    MODULE=`$DIALOG  --title "Select module to remove please."  \
+    MODULE=`$DIALOG --title "Select module to remove please." \
                     --item-help                               \
                     --ok-label      "Select"                  \
                     --cancel-label  "Exit"                    \
@@ -168,10 +163,7 @@
                     $INSTALLED_MODULES`
   do
     DESCRIPTION="Description unavailable"
-    SECTION=`find_section  $MODULE`  &&
-    if  [  -x      $MOONBASE/$SECTION/$MODULE/DETAILS  ];  then
-      DESCRIPTION=`$MOONBASE/$SECTION/$MODULE/DETAILS`
-    fi
+    run_module_file $MODULE DETAILS
 
     if  $DIALOG  --title      "Removal $MODULE"  \
                  --yesno      "$DESCRIPTION"    \
@@ -258,7 +250,7 @@
 
       if  SECTION=`find_section  $MODULE`;  then
         SHORT="Short Description Unavailable"
-        .  $MOONBASE/$SECTION/$MODULE/DETAILS  >  /dev/null
+	run_module_file $MODULE DETAILS &> /dev/null
 
         echo  $MODULE
         echo  $VERSION
@@ -795,7 +787,7 @@
 
 #lets load the menu code
 if [ -n "$MENUS" ]; then
-  for FILE in `echo $MENUS/*.menu` ; do
+  for FILE in $(echo $MENUS/*.menu) ; do
     [ -s "$FILE" ] && . "$FILE"
   done
 fi