Forráskód Böngészése

Merge pull request #30473 from albers/completion-plugins-format

Use native call for listing plugins in bash completion
Vincent Demeester 8 éve
szülő
commit
fa5e0973ec
1 módosított fájl, 4 hozzáadás és 4 törlés
  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