From 53376b60c6c0a0216f21a735e16d8c6b5729a458 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Wed, 29 Nov 2017 11:17:20 +0100 Subject: [PATCH] Minor bash completion improvements/fixes Signed-off-by: Harald Albers --- contrib/completion/bash/docker | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 6778bd7490..78ada63a3e 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -1372,10 +1372,7 @@ _docker_container_commit() { if [ "$cword" -eq "$counter" ]; then __docker_complete_containers_all return - fi - (( counter++ )) - - if [ "$cword" -eq "$counter" ]; then + elif [ "$cword" -eq "$((counter + 1))" ]; then __docker_complete_images --repo --tag return fi @@ -2593,7 +2590,7 @@ _docker_image_history() { COMPREPLY=( $( compgen -W "--format --help --human=false -H=false --no-trunc --quiet -q" -- "$cur" ) ) ;; *) - local counter=$(__docker_pos_first_nonflag) + local counter=$(__docker_pos_first_nonflag '--format') if [ "$cword" -eq "$counter" ]; then __docker_complete_images --force-tag --id fi @@ -2619,11 +2616,9 @@ _docker_image_import() { *) local counter=$(__docker_pos_first_nonflag '--change|-c|--message|-m') if [ "$cword" -eq "$counter" ]; then + _filedir return - fi - (( counter++ )) - - if [ "$cword" -eq "$counter" ]; then + elif [ "$cword" -eq "$((counter + 1))" ]; then __docker_complete_images --repo --tag return fi @@ -2798,10 +2793,7 @@ _docker_image_tag() { if [ "$cword" -eq "$counter" ]; then __docker_complete_images --force-tag --id return - fi - (( counter++ )) - - if [ "$cword" -eq "$counter" ]; then + elif [ "$cword" -eq "$((counter + 1))" ]; then __docker_complete_images --repo --tag return fi