From abbc5424809c3a4a2d82e7e51c9613d930793321 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Wed, 19 Oct 2016 18:26:12 +0200 Subject: [PATCH] Move bash completion logic to new subcommand: commit Signed-off-by: Harald Albers Upstream-commit: 6a0dff0a9a17aeeabb84aedd2c37008ca93f4a82 Component: engine --- .../engine/contrib/completion/bash/docker | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/components/engine/contrib/completion/bash/docker b/components/engine/contrib/completion/bash/docker index 1b84f45f09..727ea68d08 100644 --- a/components/engine/contrib/completion/bash/docker +++ b/components/engine/contrib/completion/bash/docker @@ -954,7 +954,31 @@ _docker_container_attach() { } _docker_container_commit() { - _docker_commit + case "$prev" in + --author|-a|--change|-c|--message|-m) + return + ;; + esac + + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--author -a --change -c --help --message -m --pause=false -p=false" -- "$cur" ) ) + ;; + *) + local counter=$(__docker_pos_first_nonflag '--author|-a|--change|-c|--message|-m') + + if [ $cword -eq $counter ]; then + __docker_complete_containers_all + return + fi + (( counter++ )) + + if [ $cword -eq $counter ]; then + __docker_complete_image_repos_and_tags + return + fi + ;; + esac } _docker_container_cp() { @@ -1060,31 +1084,7 @@ _docker_container_wait() { _docker_commit() { - case "$prev" in - --author|-a|--change|-c|--message|-m) - return - ;; - esac - - case "$cur" in - -*) - COMPREPLY=( $( compgen -W "--author -a --change -c --help --message -m --pause=false -p=false" -- "$cur" ) ) - ;; - *) - local counter=$(__docker_pos_first_nonflag '--author|-a|--change|-c|--message|-m') - - if [ $cword -eq $counter ]; then - __docker_complete_containers_all - return - fi - (( counter++ )) - - if [ $cword -eq $counter ]; then - __docker_complete_image_repos_and_tags - return - fi - ;; - esac + _docker_container_commit } _docker_cp() {