From fff885e0adc619e9f2f825a53b026f4ecbee91af Mon Sep 17 00:00:00 2001 From: Mike Goelzer Date: Wed, 15 Jun 2016 12:28:33 -0700 Subject: [PATCH 1/3] Add bash completion for `docker service scale` Signed-off-by: Mike Goelzer Conflicts: contrib/completion/bash/docker Upstream-commit: 5cf73a47f5327c38b27400012333a9e569f1a584 Component: engine --- .../engine/contrib/completion/bash/docker | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/components/engine/contrib/completion/bash/docker b/components/engine/contrib/completion/bash/docker index 888d929074..97d509c474 100644 --- a/components/engine/contrib/completion/bash/docker +++ b/components/engine/contrib/completion/bash/docker @@ -1531,6 +1531,7 @@ _docker_service() { inspect ls list rm remove + scale tasks update " @@ -1703,6 +1704,18 @@ _docker_service_ls() { esac } +_docker_service_scale() { + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--help" -- "$cur" ) ) + ;; + *) + COMPREPLY=( $(compgen -S "=" -W "$(__docker_services $1)" -- "$cur") ) + __docker_nospace + ;; + esac +} + _docker_swarm() { local subcommands=" init @@ -1726,7 +1739,7 @@ _docker_swarm() { _docker_swarm_init() { case "$cur" in -*) - COMPREPLY=( $( compgen -W "--help --auto-accept --force-new-cluster --secret" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--auto-accept --force-new-cluster --help --secret" -- "$cur" ) ) ;; esac } @@ -1805,7 +1818,7 @@ _docker_node_accept() { _docker_node_inspect() { case "$cur" in -*) - COMPREPLY=( $( compgen -W "--help --format --pretty" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--format --help --pretty" -- "$cur" ) ) ;; *) __docker_complete_nodes @@ -1815,7 +1828,7 @@ _docker_node_inspect() { _docker_node_ls() { case "$cur" in -*) - COMPREPLY=( $( compgen -W "--help --filter --quiet" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--filter --help --quiet" -- "$cur" ) ) ;; esac } @@ -1853,7 +1866,7 @@ _docker_node_rm() { _docker_node_tasks() { case "$cur" in -*) - COMPREPLY=( $( compgen -W "--help --no-resolve --filter --all" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--all --filter --help --no-resolve" -- "$cur" ) ) ;; *) __docker_complete_nodes_plus_self @@ -1863,7 +1876,7 @@ _docker_node_tasks() { _docker_node_update() { case "$cur" in -*) - COMPREPLY=( $( compgen -W "--help --availability --membership --role" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--availability --help --membership --role" -- "$cur" ) ) ;; *) __docker_complete_nodes From 26f07d39fc0d28573febcc9a7c1fac17efc6a3e5 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Sat, 18 Jun 2016 09:52:02 -0700 Subject: [PATCH 2/3] correct sort order in new bash completions The completion for the new `docker service`, `docker swarm` and `docker node` command families were partly added in non-alphabetical order. Signed-off-by: Harald Albers Upstream-commit: 19753ec84dcd2961adf64c4c66b09a2f4ca3220a Component: engine --- .../engine/contrib/completion/bash/docker | 210 +++++++++--------- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/components/engine/contrib/completion/bash/docker b/components/engine/contrib/completion/bash/docker index 97d509c474..554341a99b 100644 --- a/components/engine/contrib/completion/bash/docker +++ b/components/engine/contrib/completion/bash/docker @@ -1591,6 +1591,82 @@ _docker_service_create() { esac } +_docker_service_inspect() { + case "$prev" in + --format|-f) + return + ;; + esac + + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--format -f --help --pretty -p" -- "$cur" ) ) + ;; + *) + __docker_complete_services + esac +} + +_docker_service_list() { + _docker_service_ls +} + +_docker_service_ls() { + case "$prev" in + --format|-f) + return + ;; + esac + + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "-f --filter --help --quiet -q" -- "$cur" ) ) + ;; + esac +} + +_docker_service_remove() { + _docker_service_rm +} + +_docker_service_rm() { + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--help" -- "$cur" ) ) + ;; + *) + __docker_complete_services + esac +} + +_docker_service_scale() { + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--help" -- "$cur" ) ) + ;; + *) + COMPREPLY=( $(compgen -S "=" -W "$(__docker_services $1)" -- "$cur") ) + __docker_nospace + ;; + esac +} + +_docker_service_tasks() { + case "$prev" in + --format|-f) + return + ;; + esac + + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--all -a --filter -f --help --no-resolve -n" -- "$cur" ) ) + ;; + *) + __docker_complete_services + esac +} + _docker_service_update() { local options_with_args=" --arg @@ -1640,89 +1716,13 @@ _docker_service_update() { esac } -_docker_service_inspect() { - case "$prev" in - --format|-f) - return - ;; - esac - - case "$cur" in - -*) - COMPREPLY=( $( compgen -W "--format -f --help --pretty -p" -- "$cur" ) ) - ;; - *) - __docker_complete_services - esac -} - -_docker_service_tasks() { - case "$prev" in - --format|-f) - return - ;; - esac - - case "$cur" in - -*) - COMPREPLY=( $( compgen -W "--all -a --filter -f --help --no-resolve -n" -- "$cur" ) ) - ;; - *) - __docker_complete_services - esac -} - -_docker_service_remove() { - _docker_service_rm -} - -_docker_service_rm() { - case "$cur" in - -*) - COMPREPLY=( $( compgen -W "--help" -- "$cur" ) ) - ;; - *) - __docker_complete_services - esac -} - -_docker_service_list() { - _docker_service_ls -} - -_docker_service_ls() { - case "$prev" in - --format|-f) - return - ;; - esac - - case "$cur" in - -*) - COMPREPLY=( $( compgen -W "-f --filter --help --quiet -q" -- "$cur" ) ) - ;; - esac -} - -_docker_service_scale() { - case "$cur" in - -*) - COMPREPLY=( $( compgen -W "--help" -- "$cur" ) ) - ;; - *) - COMPREPLY=( $(compgen -S "=" -W "$(__docker_services $1)" -- "$cur") ) - __docker_nospace - ;; - esac -} - _docker_swarm() { local subcommands=" init - join - update - leave inspect + join + leave + update " __docker_subcommands "$subcommands" && return @@ -1744,6 +1744,14 @@ _docker_swarm_init() { esac } +_docker_swarm_inspect() { + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--format --help" -- "$cur" ) ) + ;; + esac +} + _docker_swarm_join() { case "$cur" in -*) @@ -1752,6 +1760,14 @@ _docker_swarm_join() { esac } +_docker_swarm_leave() { + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--force --help" -- "$cur" ) ) + ;; + esac +} + _docker_swarm_update() { case "$prev" in --auto-accept|--cert-expiry|--dispatcher-heartbeat|--secret|--task-history-limit) @@ -1766,22 +1782,6 @@ _docker_swarm_update() { esac } -_docker_swarm_leave() { - case "$cur" in - -*) - COMPREPLY=( $( compgen -W "--force --help" -- "$cur" ) ) - ;; - esac -} - -_docker_swarm_inspect() { - case "$cur" in - -*) - COMPREPLY=( $( compgen -W "--format --help" -- "$cur" ) ) - ;; - esac -} - _docker_node() { local subcommands=" accept @@ -1815,6 +1815,16 @@ _docker_node_accept() { esac } +_docker_node_demote() { + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--help" -- "$cur" ) ) + ;; + *) + __docker_complete_manager_nodes + esac +} + _docker_node_inspect() { case "$cur" in -*) @@ -1843,16 +1853,6 @@ _docker_node_promote() { esac } -_docker_node_demote() { - case "$cur" in - -*) - COMPREPLY=( $( compgen -W "--help" -- "$cur" ) ) - ;; - *) - __docker_complete_manager_nodes - esac -} - _docker_node_rm() { case "$cur" in -*) From e8b9b6a3933860b324c734e711cdca1b1ccaa1cf Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Sat, 18 Jun 2016 10:11:46 -0700 Subject: [PATCH 3/3] fix bash completion for `docker {swarm,node}` subcommands Signed-off-by: Harald Albers Upstream-commit: e65f036e134c428b1303b00a8f08b0eea79f0701 Component: engine --- .../engine/contrib/completion/bash/docker | 64 +++++++++++++++++-- 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/components/engine/contrib/completion/bash/docker b/components/engine/contrib/completion/bash/docker index 554341a99b..81e53b17a4 100644 --- a/components/engine/contrib/completion/bash/docker +++ b/components/engine/contrib/completion/bash/docker @@ -1737,22 +1737,40 @@ _docker_swarm() { } _docker_swarm_init() { + case "$prev" in + --auto-accept|--listen-addr|--secret) + return + ;; + esac + case "$cur" in -*) - COMPREPLY=( $( compgen -W "--auto-accept --force-new-cluster --help --secret" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--auto-accept --force-new-cluster --help --listen-addr --secret" -- "$cur" ) ) ;; esac } _docker_swarm_inspect() { + case "$prev" in + --format|-f) + return + ;; + esac + case "$cur" in -*) - COMPREPLY=( $( compgen -W "--format --help" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--format -f --help" -- "$cur" ) ) ;; esac } _docker_swarm_join() { + case "$prev" in + --ca-hash|--listen-addr|--secret) + return + ;; + esac + case "$cur" in -*) COMPREPLY=( $( compgen -W "--ca-hash --help --listen-addr --manager --secret" -- "$cur" ) ) @@ -1787,9 +1805,9 @@ _docker_node() { accept demote inspect - ls + ls list promote - rm + rm remove tasks update " @@ -1826,19 +1844,35 @@ _docker_node_demote() { } _docker_node_inspect() { + case "$prev" in + --format|-f) + return + ;; + esac + case "$cur" in -*) - COMPREPLY=( $( compgen -W "--format --help --pretty" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--format -f --help --pretty -p" -- "$cur" ) ) ;; *) __docker_complete_nodes esac } +_docker_node_list() { + _docker_node_ls +} + _docker_node_ls() { + case "$prev" in + --filter|-f) + return + ;; + esac + case "$cur" in -*) - COMPREPLY=( $( compgen -W "--filter --help --quiet" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--filter -f --help --quiet -q" -- "$cur" ) ) ;; esac } @@ -1853,6 +1887,10 @@ _docker_node_promote() { esac } +_docker_node_remove() { + _docker_node_rm +} + _docker_node_rm() { case "$cur" in -*) @@ -1864,9 +1902,15 @@ _docker_node_rm() { } _docker_node_tasks() { + case "$prev" in + --filter|-f) + return + ;; + esac + case "$cur" in -*) - COMPREPLY=( $( compgen -W "--all --filter --help --no-resolve" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--all -a --filter -f --help --no-resolve -n" -- "$cur" ) ) ;; *) __docker_complete_nodes_plus_self @@ -1874,6 +1918,12 @@ _docker_node_tasks() { } _docker_node_update() { + case "$prev" in + --availability|--membership|--role) + return + ;; + esac + case "$cur" in -*) COMPREPLY=( $( compgen -W "--availability --help --membership --role" -- "$cur" ) )