Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4136 from laurazard/fix-bash-file-completion 

Fix plugin completion results parsing for `ShellCompDirectiveFilterFileExt`
This commit is contained in:
Sebastiaan van Stijn 2023-04-04 11:59:38 +02:00 committed by GitHub
parent a5d4fb11fa 683e4bf0c4
commit 1d9491c25e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/completion/bash/docker
View File

@ -1155,7 +1155,20 @@ __docker_complete_plugin() {
resultArray+=( "$value" ) resultArray+=( "$value" )
fi fi
done done
local result=$(eval "${resultArray[*]}" 2> /dev/null | grep -v '^:[0-9]*$') local rawResult=$(eval "${resultArray[*]}" 2> /dev/null)
local result=$(grep -v '^:[0-9]*$' <<< "$rawResult")
# Compose V2 completions sometimes returns returns `:8` (ShellCompDirectiveFilterFileExt)
# with the expected file extensions (such as `yml`, `yaml`) to indicate that the shell should
# provide autocompletions for files with matching extensions
local completionFlag=$(tail -1 <<< "$rawResult")
if [ "$completionFlag" == ":8" ]; then
# format a valid glob pattern for the provided file extensions
local filePattern=$(tr '\n' '|' <<< "$result")
_filedir "$filePattern"
return
fi
# if result empty, just use filename completion as fallback # if result empty, just use filename completion as fallback
if [ -z "$result" ]; then if [ -z "$result" ]; then