From 341ff018a25e328f54eee2fe7e0ddef95fad84ca Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Mon, 17 Aug 2015 15:48:50 +0200 Subject: [PATCH] Fix bash completion for log driver options This option was incorrectly ported to the new `daemon` subcommand structure. Beside the obvious effect that completion of `docker daemon --log-opt` did not work, this also caused completion of `docker` and `docker xxx` to fail on macs with > bash: words: bad array subscript Signed-off-by: Harald Albers (cherry picked from commit 18381faee685c6d28dd7438a183bf7a441e8c9a1) Conflicts: contrib/completion/bash/docker --- contrib/completion/bash/docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 2cba086fe..e4f828202 100755 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -338,8 +338,6 @@ _docker_docker() { ;; esac - __docker_complete_log_driver_options && return - case "$cur" in -*) COMPREPLY=( $( compgen -W "$boolean_options $global_options_with_args" -- "$cur" ) ) @@ -528,6 +526,8 @@ _docker_daemon() { ;; esac + __docker_complete_log_driver_options && return + case "$cur" in -*) COMPREPLY=( $( compgen -W "$boolean_options $options_with_args" -- "$cur" ) )