lib/pvl/main.sh
changeset 676 775747ebdc45
parent 654 8069b08e90ac
child 704 1d5625a944fe
--- 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
 }