Quellcode durchsuchen

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 <github@albersweb.de>
Harald Albers vor 8 Jahren
Ursprung
Commit
5a067e5255
1 geänderte Dateien mit 4 neuen und 4 gelöschten Zeilen
  1. 4 4
      contrib/completion/bash/docker

+ 4 - 4
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