diff options
| author | Sébastien M-B <essembeh@gmail.com> | 2012-06-27 00:12:55 +0200 |
|---|---|---|
| committer | Sébastien M-B <essembeh@gmail.com> | 2012-06-27 00:12:55 +0200 |
| commit | 8d23a3611086e9a13e7ad754c57fa8cc4797bfa9 (patch) | |
| tree | b521e91a17b715259ed31ffa163f9254f8b546a8 /plugins/rbenv | |
| parent | 18cb11903f8208403a0ba5a8f2ece1a0bd4ef9a3 (diff) | |
| parent | 29fb24487cce4e61bdc24a9a0308f04a739a3d1f (diff) | |
| download | zsh-8d23a3611086e9a13e7ad754c57fa8cc4797bfa9.tar.gz zsh-8d23a3611086e9a13e7ad754c57fa8cc4797bfa9.tar.bz2 zsh-8d23a3611086e9a13e7ad754c57fa8cc4797bfa9.zip | |
Merge branch 'master' of github.com:essembeh/oh-my-zsh
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 |