`92a54ebc7eede185cde468db5e20c43fc562f949`

Author: Robby Russell <robby@planetargon.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2014-03-08 16:13 UTC

Message

Merge pull request #2166 from cap10morgan/no-clobber-rbenv-root

rbenv plugin: don't clobber existing RBENV_ROOT & follow Homebrew's default behavior

Diff

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