CVS: theedge/sbin lunar,1.22,1.23

[sofar at lunar-linux.org]

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

Modified Files:
	lunar 
Log Message:
Adding uniform parameter passing to lvu, fixing up lvu urls to ignore testpack() and connect(), hooking up --help to lunar, also making it call the proper fix/nofix/fixdepends code. Last merged fixing code into check.lunar, so this is all together in one file and not in install.lunar.


Index: lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/sbin/lunar,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- lunar	7 Aug 2003 05:56:48 -0000	1.22
+++ lunar	7 Aug 2003 09:48:31 -0000	1.23
@@ -34,15 +34,15 @@
 Example:        lunar
   This invokes the full-screen interface
   
-Usage:		lunar [optional parameters] [parameters]
+Usage:		lunar [general options] [command [command parameters]]
 
-Optional Parameters:
+General options:
 
 -d  |  --debug                  Enables debug messages
 -h  |  --help                   Displays this help text
 -v  |  --verbose                Increases the level of message output
 
-Parameters:
+Commands:
 
 prune                   Removes old sources and install/compile logs
 renew                   Checks ver. against moonbase & recompiles if necessary
@@ -50,6 +50,7 @@
 rebuild                 Recompiles all installed modules
 optimize                Shortcut to the optimization menu
 fix                     Check and fix all modules and internal state of lunar
+nofix                   Check but do not fix modules and internal state
 fixdepends              Check and fix the dependency database of lunar
 resurrect  modulename(s)  Force modulename(s) to be unpacked from /var/cache
 install    modulename(s)  Install a checklist of modules
@@ -439,10 +440,10 @@
 
 maintenance_menu() {
   while
-    F_HELP="lin --fix: Check and fix all modules and internal state of lunar"
-    N_HELP="lin --nofix: Check all modules but do not fix the internal state"
-    D_HELP="lin --fixdepends: Check and fix the dependency database of lunar"
-    P_HELP="lunar prune: Prune old sources and install/compile logs"
+    F_HELP="Check and fix all modules and internal state of lunar"
+    N_HELP="Check all modules but do not fix the internal state"
+    D_HELP="Check and fix the dependency database of lunar"
+    P_HELP="Prune old sources and install/compile logs"
     
     COMMAND=`$DIALOG  --title "Maintenance Menu"                         \
                       --ok-label      "Select"                           \
@@ -458,10 +459,10 @@
 		      "P"     "Prune old sources and logs"     "$P_HELP"`
   do
     case $COMMAND in
-     F)  lin --fix        ;;
-     N)  lin --nofix      ;;
-     D)  lin --fixdepends ;;
-     P)  lunar prune      ;;
+     F)  lunar fix          ;;
+     N)  lunar nofix        ;;
+     D)  lunar fixdepends   ;;
+     P)  lunar prune        ;;
     esac
     message "${MESSAGE_COLOR}Press enter to return...${DEFAULT_COLOR}"
     read
@@ -818,7 +819,7 @@
   
 . /etc/lunar/config
 
-GETOPT_ARGS=$(getopt -q -n lunar -o "dv" -l "debug,verbose" -- "$@")
+GETOPT_ARGS=$(getopt -q -n lunar -o "dhv" -l "debug,help,verbose" -- "$@")
 
 if [ -z "$?" ] ; then
   help | view_file
@@ -840,20 +841,21 @@
   done
 
   case "$1" in
-    prune    )  prune                         ;;
-    renew    )  renew                         ;;
-    update   )  update                        ;;
-    rebuild  )  rebuild                       ;;
-    optimize )  optimize_architecture         ;;
-    fix      )  shift && run_fix $@           ;;
-    fixdepends) shift && fix_depends $@       ;;
-    resurrect)  shift && resurrect_modules $@ ;;
-    install  )  shift && lin $@               ;;
-    remove   )  shift && lrm $@               ;;
-    hold     )  shift && hold_modules $@      ;;
-    unhold   )  shift && unhold_modules $@    ;;
-    exile    )  shift && exile_modules $@     ;;
-    unexile  )  shift && unexile_modules $@   ;;
+    prune      ) prune                                  ;;
+    renew      ) renew                                  ;;
+    update     ) update                                 ;;
+    rebuild    ) rebuild                                ;;
+    optimize   ) optimize_architecture                  ;;
+    fix        ) shift && run_fix $@                    ;;
+    nofix      ) shift && export NOFIX=on && run_fix $@ ;;
+    fixdepends ) shift && fix_depends $@                ;;
+    resurrect  ) shift && resurrect_modules $@          ;;
+    install    ) shift && lin $@                        ;;
+    remove     ) shift && lrm $@                        ;;
+    hold       ) shift && hold_modules $@               ;;
+    unhold     ) shift && unhold_modules $@             ;;
+    exile      ) shift && exile_modules $@              ;;
+    unexile    ) shift && unexile_modules $@            ;;
     *) main ;; 
   esac
 fi