From f38bb9561937e2282dbe3c99acd917a27ae837a2 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Thu, 26 Jan 2017 17:33:35 +0100 Subject: [PATCH] Use native call for listing plugins in bash completion `docker plugin ls` now has `--format`, so there is no more need for postprocessing raw `docker plugin ls` output with `awk` any more. This will make generation of plugin lists robust against changes in `docker plugin ls` output. Signed-off-by: Harald Albers --- contrib/completion/bash/docker | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 639702a5e2..f386791df7 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -291,13 +291,13 @@ __docker_complete_plugins_bundled() { # Set DOCKER_COMPLETION_SHOW_PLUGIN_IDS=yes to also complete IDs. # For built-in pugins, see `__docker_plugins_bundled`. __docker_plugins_installed() { - local fields + local format if [ "$DOCKER_COMPLETION_SHOW_PLUGIN_IDS" = yes ] ; then - fields='$1,$2' + format='{{.ID}} {{.Name}}' else - fields='$2' + format='{{.Name}}' fi - __docker_q plugin ls | awk "NR>1 {print $fields}" + __docker_q plugin ls --format "$format" } # __docker_complete_plugins_installed applies completion of plugins that were installed