mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-19 21:41:07 +01:00
Style fixes and shorter command lookup
This commit is contained in:
parent
e1e3acc722
commit
a7e60e4a93
1 changed files with 24 additions and 19 deletions
|
@ -1,21 +1,26 @@
|
||||||
() {
|
() {
|
||||||
if which cask &> /dev/null; then
|
emulate -L zsh
|
||||||
local cask_bin cask_base f comp_files
|
|
||||||
cask_bin=$(which cask)
|
if ! (( $+commands[cask] )); then
|
||||||
cask_base=${cask_bin:h:h}
|
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)
|
# Plain cask installation location (for Cask 0.7.2 and earlier)
|
||||||
comp_files=($cask_base/etc/cask_completion.zsh)
|
comp_files=($cask_base/etc/cask_completion.zsh)
|
||||||
|
|
||||||
# Mac Homebrew installs the completion in a different location
|
# Mac Homebrew installs the completion in a different location
|
||||||
if which brew &> /dev/null; then
|
if (( $+commands[brew] )); then
|
||||||
comp_files+=`brew --prefix`/share/zsh/site-functions/cask_completion.zsh
|
comp_files+=($(brew --prefix)/share/zsh/site-functions/cask_completion.zsh)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Load first found file
|
||||||
for f in $comp_files; do
|
for f in $comp_files; do
|
||||||
if [[ -f $f ]]; then
|
if [[ -f "$f" ]]; then
|
||||||
source $f;
|
source "$f"
|
||||||
break;
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
else
|
|
||||||
print "zsh cask plugin: cask not found"
|
|
||||||
fi
|
|
||||||
}
|
}
|
Loading…
Reference in a new issue