Move filtering to __docker_complete_services, as suggested by @albers

artheus-sbab · thaJeztah · commit 431ea11fc301 · 2019-10-29T15:11:13.000+01:00
Signed-off-by: Morten Hekkvang &lt;morten.hekkvang@sbab.se&gt;
(cherry picked from commit 6ebcc211a7a955b93297db1f0ad96237c14691ae)
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
Upstream-commit: 9447d7431b8354083e25dc5768bcba23c5256bd8
Component: cli
diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker
@@ -561,7 +561,7 @@ __docker_services() {
 		shift
 	fi
 
-  __docker_q service ls -q --format "$format" --filter "name=$1"
+  __docker_q service ls --quiet --format "$format" "$@"
 }
 
 # __docker_complete_services applies completion of services based on the current
@@ -573,7 +573,7 @@ __docker_complete_services() {
 		current="$2"
 		shift 2
 	fi
-	COMPREPLY=( $(__docker_services "$@" "$current") )
+	COMPREPLY=( $(__docker_services "$@" --filter "name=$current") )
 }
 
 # __docker_tasks returns a list of all task IDs.

Original file line number	Diff line number	Diff line change
`@@ -561,7 +561,7 @@ __docker_services() {`
`561`	`561`	`shift`
`562`	`562`	`fi`
`563`	`563`
`564`		`- __docker_q service ls -q --format "$format" --filter "name=$1"`
	`564`	`+ __docker_q service ls --quiet --format "$format" "$@"`
`565`	`565`	`}`
`566`	`566`
`567`	`567`	`# __docker_complete_services applies completion of services based on the current`
`@@ -573,7 +573,7 @@ __docker_complete_services() {`
`573`	`573`	`current="$2"`
`574`	`574`	`shift 2`
`575`	`575`	`fi`
`576`		`- COMPREPLY=( $(__docker_services "$@" "$current") )`
	`576`	`+ COMPREPLY=( $(__docker_services "$@" --filter "name=$current") )`
`577`	`577`	`}`
`578`	`578`
`579`	`579`	`# __docker_tasks returns a list of all task IDs.`