diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index ca1d44ea22..4fb01ea047 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -2080,7 +2080,29 @@ _docker_image_images() { } _docker_image_import() { - _docker_import + case "$prev" in + --change|-c|--message|-m) + return + ;; + esac + + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--change -c --help --message -m" -- "$cur" ) ) + ;; + *) + local counter=$(__docker_pos_first_nonflag '--change|-c|--message|-m') + if [ $cword -eq $counter ]; then + return + fi + (( counter++ )) + + if [ $cword -eq $counter ]; then + __docker_complete_image_repos_and_tags + return + fi + ;; + esac } _docker_image_inspect() { @@ -2180,29 +2202,7 @@ _docker_images() { } _docker_import() { - case "$prev" in - --change|-c|--message|-m) - return - ;; - esac - - case "$cur" in - -*) - COMPREPLY=( $( compgen -W "--change -c --help --message -m" -- "$cur" ) ) - ;; - *) - local counter=$(__docker_pos_first_nonflag '--change|-c|--message|-m') - if [ $cword -eq $counter ]; then - return - fi - (( counter++ )) - - if [ $cword -eq $counter ]; then - __docker_complete_image_repos_and_tags - return - fi - ;; - esac + _docker_image_import } _docker_info() {