Style fixes and shorter command lookup

This commit is contained in:
Marc Cornellà 2016-02-12 18:55:53 +01:00
parent e1e3acc722
commit a7e60e4a93

View File

@ -1,21 +1,26 @@
() {
if which cask &> /dev/null; then
local cask_bin cask_base f comp_files
cask_bin=$(which cask)
cask_base=${cask_bin:h:h}
# Plain cask installation location (for Cask 0.7.2 and earlier)
comp_files=( $cask_base/etc/cask_completion.zsh )
# Mac Homebrew installs the completion in a different location
if which brew &> /dev/null; then
comp_files+=`brew --prefix`/share/zsh/site-functions/cask_completion.zsh
fi
for f in $comp_files; do
if [[ -f $f ]]; then
source $f;
break;
fi
done
else
print "zsh cask plugin: cask not found"
emulate -L zsh
if ! (( $+commands[cask] )); then
print "zsh cask plugin: cask command not found" >&2
return
fi
}
cask_base=${commands[cask]:h:h}
# Plain cask installation location (for Cask 0.7.2 and earlier)
comp_files=($cask_base/etc/cask_completion.zsh)
# Mac Homebrew installs the completion in a different location
if (( $+commands[brew] )); then
comp_files+=($(brew --prefix)/share/zsh/site-functions/cask_completion.zsh)
fi
# Load first found file
for f in $comp_files; do
if [[ -f "$f" ]]; then
source "$f"
break
fi
done
}