`3ac3141cd610de995b2435011ac895ad15b89e2e`

Author: Robby Russell <robby@planetargon.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2012-06-22 13:39 UTC

Message

Merge pull request #1174 from insside/rbenv-homebrew-fix

rbenv plugin now uses 'brew --prefix rbenv' command to find rbenv folder

Diff

 1diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
 2index ae37404cd8328ab621cb4f8ab804cc143efbe9c0..a62dd560209e7a63b782e3043e4300bbbd07a252 100644
 3--- a/plugins/rbenv/rbenv.plugin.zsh
 4+++ b/plugins/rbenv/rbenv.plugin.zsh
 5@@ -1,5 +1,18 @@
 6+_homebrew-installed() {
 7+  type brew &> /dev/null
 8+}
 9+
10+_rbenv-from-homebrew-installed() {
11+  brew --prefix rbenv &> /dev/null
12+}
13+
14 FOUND_RBENV=0
15-for rbenvdir in "$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" ; do
16+rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv")
17+if _homebrew-installed && _rbenv-from-homebrew-installed ; then
18+    rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}")
19+fi
20+
21+for rbenvdir in "${rbenvdirs[@]}" ; do
22   if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then
23     FOUND_RBENV=1
24     export RBENV_ROOT=$rbenvdir