lib/pvl: fix MAIN_MODULE help/getopts/opt
authorTero Marttila <terom@paivola.fi>
Mon, 02 Mar 2015 00:25:21 +0200
changeset 676 775747ebdc45
parent 675 f1335a4301d0
child 677 8e3dfa27d8d1
lib/pvl: fix MAIN_MODULE help/getopts/opt
lib/pvl/hosts/update.sh
lib/pvl/main.sh
--- a/lib/pvl/hosts/update.sh	Mon Mar 02 00:19:39 2015 +0200
+++ b/lib/pvl/hosts/update.sh	Mon Mar 02 00:25:21 2015 +0200
@@ -151,6 +151,6 @@
 # entry point
 MODULES=(log commit apply service test)
 MODULE=hosts
-MODULE_MAIN=update
+MAIN_MODULE=update
 
 . $LIB/pvl/main.sh && main "$@"
--- a/lib/pvl/main.sh	Mon Mar 02 00:19:39 2015 +0200
+++ b/lib/pvl/main.sh	Mon Mar 02 00:25:21 2015 +0200
@@ -18,7 +18,7 @@
     -h      display this help text
 END
     
-    for module in ${MODULES[@]}; do
+    for module in ${MODULES[@]} $MAIN_MODULE; do
         func_test ${module}_help && ${module}_help
     done
 }
@@ -30,7 +30,7 @@
     local opts=$(
         echo -n 'h'
 
-        for module in ${MODULES[@]}; do
+        for module in ${MODULES[@]} $MAIN_MODULE; do
             module_getopts=${module}_GETOPTS
             echo -n ${!module_getopts:-}
         done
@@ -45,7 +45,7 @@
             exit 0;
         fi
 
-        for module in ${MODULES[@]}; do
+        for module in ${MODULES[@]} $MAIN_MODULE; do
             if func_test ${module}_opt && ${module}_opt $opt "${OPTARG:-}"; then
                 opt_module=$module
             fi
@@ -65,14 +65,12 @@
 
     main_opts "$@"
 
-    for module in ${MODULES[@]}; do
+    for module in ${MODULES[@]} $MAIN_MODULE; do
         func_test ${module}_init && ${module}_init
     done
 
-    func_test ${MODULE_MAIN}_init && ${MODULE_MAIN}_init
-
     # initialize relative paths
     [ -z "$SRV" ] || cd $SRV
 
-    ${MODULE_MAIN}_main
+    ${MAIN_MODULE}_main
 }