Tweak the bash completion script.

* Add --config
* Alphabetize various lists
* Remove some local temp variables
This commit is contained in:
Adam Vandenberg 2010-05-30 13:00:51 -07:00
parent cc34c0c392
commit b0bc592e17

View File

@ -6,42 +6,38 @@
_brew_to_completion() _brew_to_completion()
{ {
local actions cur prev prev_index local actions cur prev prev_index
local cellar_contents formulae which_cellar brew_base local cellar_contents formulae
COMPREPLY=() COMPREPLY=()
cur="${COMP_WORDS[COMP_CWORD]}" cur="${COMP_WORDS[COMP_CWORD]}"
# We only complete unabbreviated commands... # We usually only complete unabbreviated commands.
actions="cat cleanup configure create deps doctor edit generate homepage info install list link log outdated prune remove search unlink update uses" actions="--config cat cleanup configure create deps doctor edit generate home info install link list log outdated prune remove search unlink update uses"
if [[ ( ${COMP_CWORD} -eq 1 ) && ( ${COMP_WORDS[0]} == brew ) ]] ; then if [[ ( ${COMP_CWORD} -eq 1 ) && ( ${COMP_WORDS[0]} == brew ) ]]; then
# Subcommand list # Subcommand list.
COMPREPLY=( $(compgen -W "${actions}" -- ${cur}) ) COMPREPLY=( $(compgen -W "${actions}" -- ${cur}) )
return 0 return 0
else else
# Subcommands # Find the previous non-switch word
brew_base=`brew --repository`
# We want the non-switch previous word
prev_index=$((COMP_CWORD - 1)) prev_index=$((COMP_CWORD - 1))
prev="${COMP_WORDS[prev_index]}" prev="${COMP_WORDS[prev_index]}"
while [[ $prev == -* ]] while [[ $prev == -* ]]; do
do
prev_index=$((prev_index - 1)) prev_index=$((prev_index - 1))
prev="${COMP_WORDS[prev_index]}" prev="${COMP_WORDS[prev_index]}"
done done
case ${prev} in case ${prev} in
# Commands that take a formula... # Commands that take a formula.
cat|deps|edit|home|homepage|install|log|uses) cat|deps|edit|home|homepage|info|install|log|uses)
formulae=`ls ${brew_base}/Library/Formula/ | sed "s/\.rb//g"` formulae=$(ls $(brew --repository)/Library/Formula/ | sed "s/\.rb//g")
COMPREPLY=( $(compgen -W "${formulae}" -- ${cur}) ) COMPREPLY=( $(compgen -W "${formulae}" -- ${cur}) )
return 0 return 0
;; ;;
# Commands that take an existing brew... # Commands that take an existing brew.
abv|cleanup|info|list|link|ls|ln|rm|remove|uninstall|unlink) abv|cleanup|link|list|ln|ls|remove|rm|uninstall|unlink)
cellar_contents=`ls ${brew_base}/Cellar/` cellar_contents=$(ls $(brew --cellar))
COMPREPLY=( $(compgen -W "${cellar_contents}" -- ${cur}) ) COMPREPLY=( $(compgen -W "${cellar_contents}" -- ${cur}) )
return 0 return 0
;; ;;