diff options
| author | Sébastien <seb@Macbook.local> | 2012-06-25 17:41:06 +0200 |
|---|---|---|
| committer | Sébastien <seb@Macbook.local> | 2012-06-25 17:41:06 +0200 |
| commit | 29fb24487cce4e61bdc24a9a0308f04a739a3d1f (patch) | |
| tree | 7ef05913a12a6f67cd095dac9161e663035e53e2 /plugins/rbenv | |
| parent | 579f33d489c8b61e77279894cd467c3207955c09 (diff) | |
| parent | d165a84dc0e8d2eb0774ed26995e7046c0aff41f (diff) | |
| download | zsh-29fb24487cce4e61bdc24a9a0308f04a739a3d1f.tar.gz zsh-29fb24487cce4e61bdc24a9a0308f04a739a3d1f.tar.bz2 zsh-29fb24487cce4e61bdc24a9a0308f04a739a3d1f.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'plugins/rbenv')
| -rw-r--r-- | plugins/rbenv/rbenv.plugin.zsh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh index ae37404cd..a62dd5602 100644 --- a/plugins/rbenv/rbenv.plugin.zsh +++ b/plugins/rbenv/rbenv.plugin.zsh @@ -1,5 +1,18 @@ +_homebrew-installed() { + type brew &> /dev/null +} + +_rbenv-from-homebrew-installed() { + brew --prefix rbenv &> /dev/null +} + FOUND_RBENV=0 -for rbenvdir in "$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" ; do +rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv") +if _homebrew-installed && _rbenv-from-homebrew-installed ; then + rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}") +fi + +for rbenvdir in "${rbenvdirs[@]}" ; do if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then FOUND_RBENV=1 export RBENV_ROOT=$rbenvdir |