From f49daf60b9b122ba8dce6ee66c4af118df480099 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Wed, 19 Oct 2016 18:46:02 +0200 Subject: [PATCH] Move bash completion logic to new subcommand: exec Signed-off-by: Harald Albers Upstream-commit: f5601993338097f92e24042153c2910d340e257c Component: cli --- components/cli/contrib/completion/bash/docker | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index 9051cb5ca4..55659d1b0e 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -1045,7 +1045,23 @@ _docker_container_diff() { } _docker_container_exec() { - _docker_exec + __docker_complete_detach-keys && return + + case "$prev" in + --user|-u) + __docker_complete_user_group + return + ;; + esac + + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--detach -d --detach-keys -e --env --help --interactive -i --privileged -t --tty -u --user" -- "$cur" ) ) + ;; + *) + __docker_complete_containers_running + ;; + esac } _docker_container_export() { @@ -1421,23 +1437,7 @@ _docker_events() { } _docker_exec() { - __docker_complete_detach-keys && return - - case "$prev" in - --user|-u) - __docker_complete_user_group - return - ;; - esac - - case "$cur" in - -*) - COMPREPLY=( $( compgen -W "--detach -d --detach-keys -e --env --help --interactive -i --privileged -t --tty -u --user" -- "$cur" ) ) - ;; - *) - __docker_complete_containers_running - ;; - esac + _docker_container_exec } _docker_export() {