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

bash completions: use proper Bash syntax

Browse Source
This commit is contained in:
Maxim Belkin 2019-01-11 11:32:26 -06:00
parent 29017d50de
commit ca29e508f7
No known key found for this signature in database
GPG Key ID: AC71560D4C5F2338
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
completions/bash/brew
View File

@ -13,7 +13,7 @@ __brewcomp_words_include() {
then then
return 0 return 0
fi fi
i="$((++i))" (( i++ ))
done done
return 1 return 1
} }
@ -24,7 +24,7 @@ __brewcomp_prev() {
local prv="${COMP_WORDS[idx]}" local prv="${COMP_WORDS[idx]}"
while [[ "$prv" = -* ]] while [[ "$prv" = -* ]]
do do
idx="$((--idx))" (( idx-- ))
prv="${COMP_WORDS[idx]}" prv="${COMP_WORDS[idx]}"
done done
echo "$prv" echo "$prv"
@ -33,7 +33,7 @@ __brewcomp_prev() {
__brewcomp() { __brewcomp() {
# break $1 on space, tab, and newline characters, # break $1 on space, tab, and newline characters,
# and turn it into a newline separated list of words # and turn it into a newline separated list of words
local list s sep=$'\n' IFS=$' '$'\t'$'\n' local list s sep=$'\n' IFS=$' \t\n'
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
for s in $1 for s in $1
@ -379,7 +379,7 @@ _brew_readall() {
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in case "$cur" in
--*) --*)
__brewcomp "--syntax" __brewcomp " --aliases --syntax"
return return
;; ;;
esac esac
@ -532,7 +532,7 @@ __brew_caskcomp_words_include ()
if [[ "${COMP_WORDS[i]}" = "$1" ]]; then if [[ "${COMP_WORDS[i]}" = "$1" ]]; then
return 0 return 0
fi fi
i=$((++i)) (( i++ ))
done done
return 1 return 1
} }
@ -543,7 +543,7 @@ __brew_caskcomp_prev ()
local idx=$((COMP_CWORD - 1)) local idx=$((COMP_CWORD - 1))
local prv="${COMP_WORDS[idx]}" local prv="${COMP_WORDS[idx]}"
while [[ $prv == -* ]]; do while [[ $prv == -* ]]; do
idx=$((--idx)) (( idx-- ))
prv="${COMP_WORDS[idx]}" prv="${COMP_WORDS[idx]}"
done done
echo "$prv" echo "$prv"
@ -553,7 +553,7 @@ __brew_caskcomp ()
{ {
# break $1 on space, tab, and newline characters, # break $1 on space, tab, and newline characters,
# and turn it into a newline separated list of words # and turn it into a newline separated list of words
local list s sep=$'\n' IFS=$' '$'\t'$'\n' local list s sep=$'\n' IFS=$' \t\n'
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
for s in $1; do for s in $1; do
@ -561,7 +561,7 @@ __brew_caskcomp ()
list="$list$s$sep" list="$list$s$sep"
done done
IFS=$sep IFS="$sep"
COMPREPLY=($(compgen -W "$list" -- "$cur")) COMPREPLY=($(compgen -W "$list" -- "$cur"))
} }
@ -708,7 +708,7 @@ _brew_cask ()
break break
;; ;;
esac esac
i=$((++i)) (( i++ ))
done done
if [[ $i -eq $COMP_CWORD ]]; then if [[ $i -eq $COMP_CWORD ]]; then
@ -759,7 +759,7 @@ _brew() {
break break
;; ;;
esac esac
i="$((++i))" (( i++ ))
done done
if [[ "$i" -eq "$COMP_CWORD" ]] if [[ "$i" -eq "$COMP_CWORD" ]]
@ -767,7 +767,7 @@ _brew() {
# Do not auto-complete "*instal" or "*uninstal" aliases for "*install" commands. # Do not auto-complete "*instal" or "*uninstal" aliases for "*install" commands.
# Prefix newline to prevent not checking the first command. # Prefix newline to prevent not checking the first command.
local cmds=$'\n'"$(brew commands --quiet --include-aliases | \grep -v instal$)" local cmds=$'\n'"$(brew commands --quiet --include-aliases | \grep -v instal$)"
__brewcomp "${cmds}" __brewcomp "$cmds"
return return
fi fi