Allow command line with noun first and (potentially) multiple verbs

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/autocluster b/autocluster
index 7afb74bc56bb93ad16fc9725da0eb70859aff016..6fc78f3e3098edad57ffc889fef1b21aeb644c7f 100755 (executable)
--- a/autocluster
+++ b/autocluster
@@ -52,6 +52,10 @@ EOF
     cat <<EOF
 
   commands:
+     base [ create | boot ] ...
+
+     cluster create
+
      create base
            create a base image
 
@@ -1154,6 +1158,26 @@ usage_config_options (){
     usage_smart_display load_config
 }
 
+actions_init ()
+{
+    actions=""
+}
+
+actions_add ()
+{
+    actions="${actions}${actions:+ }$*"
+}
+
+actions_run ()
+{
+    [ -n "$actions" ] || usage
+
+    local a
+    for a in $actions ; do
+       $a
+    done
+}
+
 ######################################################################
 
 post_config_hooks=
@@ -1248,6 +1272,28 @@ t="$1"
 shift
 
 case "$t" in
+    base)
+       actions_init
+       for t in "$@" ; do
+           case "$t" in
+               create|boot) actions_add "base_${t}" ;;
+               *) usage ;;
+           esac
+       done
+       actions_run
+       ;;
+
+    cluster)
+       actions_init
+       for t in "$@" ; do
+           case "$t" in
+               create) actions_add "cluster_${t}" ;;
+               *) usage ;;
+           esac
+       done
+       actions_run
+       ;;
+
     create)
        t="$1"
        shift