# HG changeset patch # User Tero Marttila # Date 1425052036 -7200 # Node ID c707c3ee8665a0aa193e85ce1ddd5e0798c73e0b # Parent 88ff10dae5146bf5a9012e7765ace67cef19488d lib/pvl: move main bootstrapping code to pvl/hosts/update.sh to make bin even more trivial diff -r 88ff10dae514 -r c707c3ee8665 bin/update --- a/bin/update Fri Feb 27 17:42:35 2015 +0200 +++ b/bin/update Fri Feb 27 17:47:16 2015 +0200 @@ -7,7 +7,4 @@ LIB=${LIB:-$SRC/lib} VAR=${VAR:-$SRV/var} -MODULE=hosts -MODULE_MAIN=update - -. $LIB/pvl/main.sh +. $LIB/pvl/hosts/update.sh diff -r 88ff10dae514 -r c707c3ee8665 lib/pvl/hosts/update.sh --- a/lib/pvl/hosts/update.sh Fri Feb 27 17:42:35 2015 +0200 +++ b/lib/pvl/hosts/update.sh Fri Feb 27 17:47:16 2015 +0200 @@ -1,4 +1,3 @@ -update_MODULES='log commit apply service test' update_GETOPTS='sSrR' UPDATE_SERIAL= @@ -148,3 +147,10 @@ ## Reload output update_reload } + +# entry point +MODULES=(log commit apply service test) +MODULE=hosts +MODULE_MAIN=update + +. $LIB/pvl/main.sh && main "$@" diff -r 88ff10dae514 -r c707c3ee8665 lib/pvl/main.sh --- a/lib/pvl/main.sh Fri Feb 27 17:42:35 2015 +0200 +++ b/lib/pvl/main.sh Fri Feb 27 17:47:16 2015 +0200 @@ -2,12 +2,6 @@ shopt -s globstar nullglob -. $LIB/pvl/$MODULE/$MODULE_MAIN.sh - -module_main_modules=${MODULE_MAIN}_MODULES - -MODULES=(${!module_main_modules}) - for module in ${MODULES[@]}; do . $LIB/pvl/$module.sh done @@ -79,5 +73,3 @@ ${MODULE_MAIN}_main } - -main "$@"