diff options
| author | Robby Russell <robby@planetargon.com> | 2014-03-08 08:13:19 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-03-08 08:13:19 -0800 |
| commit | 92a54ebc7eede185cde468db5e20c43fc562f949 (patch) | |
| tree | 1e722e5928c6c04554939935a91082ae5f5e4b50 | |
| parent | 978bb40d03b71ee0d8454dcec17adee48f63913d (diff) | |
| parent | 3ca3c5a126a937dc6d6d3daba241f9a0f5a4c2f2 (diff) | |
| download | zsh-92a54ebc7eede185cde468db5e20c43fc562f949.tar.gz zsh-92a54ebc7eede185cde468db5e20c43fc562f949.tar.bz2 zsh-92a54ebc7eede185cde468db5e20c43fc562f949.zip | |
Merge pull request #2166 from cap10morgan/no-clobber-rbenv-root
rbenv plugin: don't clobber existing RBENV_ROOT & follow Homebrew's default behavior
| -rw-r--r-- | plugins/rbenv/rbenv.plugin.zsh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh index 78f76c3a3..57ae2ca1f 100644 --- a/plugins/rbenv/rbenv.plugin.zsh +++ b/plugins/rbenv/rbenv.plugin.zsh @@ -10,12 +10,18 @@ FOUND_RBENV=0 rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv") if _homebrew-installed && _rbenv-from-homebrew-installed ; then rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}") + if [[ $RBENV_ROOT = '' ]]; then + RBENV_ROOT="$HOME/.rbenv" + fi fi for rbenvdir in "${rbenvdirs[@]}" ; do if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then FOUND_RBENV=1 - export RBENV_ROOT=$rbenvdir + if [[ $RBENV_ROOT = '' ]]; then + RBENV_ROOT=$rbenvdir + fi + export RBENV_ROOT export PATH=${rbenvdir}/bin:$PATH eval "$(rbenv init --no-rehash - zsh)" |