admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #8710 from Amorymeltzer/bash-complete-fewer-cask-warnings

Browse Source 
bash completion: Avoid cask deprecation warnings, learn --cask
This commit is contained in:
Markus Reiter 2020-09-13 02:47:37 +02:00 committed by GitHub
commit bb07e9191d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
completions/bash/brew
View File

@ -312,7 +312,7 @@ _brew_link() {
} }
_brew_list() { _brew_list() {
local allopts="--unbrewed --verbose --pinned --versions --multiple" local allopts="--unbrewed --verbose --pinned --versions --multiple --cask"
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in case "$cur" in
@ -408,7 +408,7 @@ _brew_outdated() {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in case "$cur" in
-*) -*)
__brewcomp "--quiet --json=v1 --fetch-HEAD" __brewcomp "--quiet --cask --json=v1 --fetch-HEAD"
return return
;; ;;
esac esac
@ -578,6 +578,7 @@ _brew_upgrade() {
--all --all
--build-from-source --build-bottle --force-bottle --build-from-source --build-bottle --force-bottle
--cleanup --cleanup
--cask
--debug --debug
--verbose --verbose
--fetch-HEAD --fetch-HEAD
@ -656,7 +657,7 @@ __brew_cask_complete_formulae ()
__brew_cask_complete_installed () __brew_cask_complete_installed ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
local inst=$(brew cask list -1) local inst=$(brew list --cask -1)
COMPREPLY=($(compgen -W "$inst" -- "$cur")) COMPREPLY=($(compgen -W "$inst" -- "$cur"))
} }
@ -672,7 +673,7 @@ __brew_cask_complete_outdated ()
{ {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
local greedy=$(__brew_caskcomp_words_include "--greedy" && echo "--greedy") local greedy=$(__brew_caskcomp_words_include "--greedy" && echo "--greedy")
local outdated=$(brew cask outdated --quiet $greedy) local outdated=$(brew outdated --cask --quiet $greedy)
COMPREPLY=($(compgen -W "$outdated" -- "$cur")) COMPREPLY=($(compgen -W "$outdated" -- "$cur"))
} }