[Lunar-commits] r25307 - lunar/trunk/sbin

[Auke Kok]

Author: sofar
Date: 2007-07-28 01:58:49 +0200 (Sat, 28 Jul 2007)
New Revision: 25307

Modified:
   lunar/trunk/sbin/lunar
Log:
Bugfix: allow empty SHORT in module details consistently. Shame on Elangelo for putting those in moonbase ;)


Modified: lunar/trunk/sbin/lunar
===================================================================
--- lunar/trunk/sbin/lunar	2007-07-27 22:45:12 UTC (rev 25306)
+++ lunar/trunk/sbin/lunar	2007-07-27 23:58:49 UTC (rev 25307)
@@ -71,12 +71,11 @@
         !  module_held       $MODULE  &&
         !  module_exiled     $MODULE
     then
-      SHORT="Short Description Unavailable"
       (
         run_details $MODULE
-        echo  $MODULE
-        echo  $VERSION
-        echo  $SHORT
+        echo  "$MODULE"
+        echo  "$VERSION"
+        echo  "${SHORT:-Short Description Unavailable}"
       )
     fi
   done
@@ -86,7 +85,7 @@
 show_sections()  {
   for SECTION in $(list_sections);  do
     [ -z "$(list_modules $SECTION)" ] || {
-      echo  $SECTION
+      echo  "$SECTION"
       echo  "section"
     }
   done
@@ -108,15 +107,15 @@
 add_pkgs()  { (
   while
     SECTION=`select_section`
-  do            
+  do
     while
-      MODULES=`show_modules $SECTION`  &&
-       MODULE=`$DIALOG  --title "Select module to install please"  \
+    show_modules $SECTION ; read
+      MODULE=`$DIALOG  --title "Select module to install please"  \
                        --item-help                               \
                        --menu                                    \
                        "$SECTION"                                \
                        0 60 10                                   \
-                       $MODULES`
+                       $(show_modules $SECTION)`
     do
       DESCRIPTION=`$MOONBASE/$SECTION/$MODULE/DETAILS`
 
@@ -219,21 +218,19 @@
 
 make_checklist()  {
   for  MODULE in `list_modules "$1"`;  do
-    SHORT="Short Description Unavailable"
     (
     run_details $MODULE
-    STATUS="OFF"
 
-    if    module_installed  $MODULE  ||
-          module_held       $MODULE
-    then  STATUS="on"
-    else  STATUS="off"
+    if module_installed $MODULE || module_held $MODULE; then
+      STATUS="on"
+    else
+      STATUS="off"
     fi
 
-    echo  $MODULE
-    echo  $VERSION
-    echo  $STATUS
-    echo  $SHORT
+    echo $MODULE
+    echo $VERSION
+    echo $STATUS
+    echo ${SHORT:-Short Description Unavailable}
     )
   done
 }