Contribution: Tweak bash completion for install
Selection of generic installation options, such as `--HEAD`, is now lumped together with selection of formulae-specific options. This allows any installation option to be tab-completed *before or after* the formula name is specified. Signed-off-by: Adam Vandenberg <flangy@gmail.com>
This commit is contained in:
parent
df113d3ce6
commit
8a1bcf70a1
@ -26,13 +26,13 @@ _brew_to_completion()
|
||||
prev="${COMP_WORDS[prev_index]}"
|
||||
done
|
||||
|
||||
case "$prev" in
|
||||
# Commands that take a formula
|
||||
cat|deps|edit|fetch|home|homepage|info|install|log|missing|options|uses|versions)
|
||||
# handle standard --options
|
||||
if [[ "$prev" == "install" && "$cur" == --* ]]; then
|
||||
# Handle installation --options
|
||||
if [[ ${COMP_WORDS[1]} == "install" && "$cur" == --* ]]; then
|
||||
local opts=$(
|
||||
local opts=( --force --verbose --debug --use-clang --use-gcc --use-llvm --ignore-dependencies --HEAD )
|
||||
local opts=(
|
||||
--force --verbose --debug --use-clang --use-gcc --use-llvm --ignore-dependencies --HEAD
|
||||
$(brew options --compact "$prev")
|
||||
)
|
||||
for o in ${opts[*]}; do
|
||||
[[ " ${COMP_WORDS[*]} " =~ " $o " ]] || echo "$o"
|
||||
done
|
||||
@ -40,6 +40,10 @@ _brew_to_completion()
|
||||
COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
|
||||
return
|
||||
fi
|
||||
|
||||
case "$prev" in
|
||||
# Commands that take a formula
|
||||
cat|deps|edit|fetch|home|homepage|info|install|log|missing|options|uses|versions)
|
||||
local ff=$(\ls $(brew --repository)/Library/Formula | sed "s/\.rb//g")
|
||||
local af=$(\ls $(brew --repository)/Library/Aliases 2> /dev/null | sed "s/\.rb//g")
|
||||
COMPREPLY=( $(compgen -W "${ff} ${af}" -- ${cur}) )
|
||||
@ -50,19 +54,6 @@ _brew_to_completion()
|
||||
COMPREPLY=( $(compgen -W "$(\ls $(brew --cellar))" -- ${cur}) )
|
||||
return
|
||||
;;
|
||||
# Complete --options for selected brew
|
||||
*)
|
||||
if [[ ${COMP_WORDS[1]} == "install" && "$cur" == --* ]]; then
|
||||
local opts=$(
|
||||
local opts=( $(brew options --compact "$prev") )
|
||||
for o in ${opts[*]}; do
|
||||
[[ " ${COMP_WORDS[*]} " =~ " $o " ]] || echo "$o"
|
||||
done
|
||||
)
|
||||
COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
|
||||
return
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user