From 09cd45cad5be7d0b6f080d098e040dc224139bb1 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Wed, 19 Oct 2016 18:52:50 +0200 Subject: [PATCH] Move bash completion logic to new subcommand: logs Signed-off-by: Harald Albers Upstream-commit: bd996a11a1e87b0122acb476528c47b81b7e7c07 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 ef4d8ae4d9..d325153b62 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -1128,7 +1128,23 @@ _docker_container_kill() { } _docker_container_logs() { - _docker_logs + case "$prev" in + --since|--tail) + return + ;; + esac + + case "$cur" in + -*) + COMPREPLY=( $( compgen -W "--details --follow -f --help --since --tail --timestamps -t" -- "$cur" ) ) + ;; + *) + local counter=$(__docker_pos_first_nonflag '--since|--tail') + if [ $cword -eq $counter ]; then + __docker_complete_containers_all + fi + ;; + esac } _docker_container_list() { @@ -1648,23 +1664,7 @@ _docker_logout() { } _docker_logs() { - case "$prev" in - --since|--tail) - return - ;; - esac - - case "$cur" in - -*) - COMPREPLY=( $( compgen -W "--details --follow -f --help --since --tail --timestamps -t" -- "$cur" ) ) - ;; - *) - local counter=$(__docker_pos_first_nonflag '--since|--tail') - if [ $cword -eq $counter ]; then - __docker_complete_containers_all - fi - ;; - esac + _docker_container_logs } _docker_network_connect() {