diff options
| author | Wes Morgan <cap10morgan@gmail.com> | 2013-10-14 09:59:20 -0600 |
|---|---|---|
| committer | Wes Morgan <cap10morgan@gmail.com> | 2013-10-14 09:59:20 -0600 |
| commit | 3ca3c5a126a937dc6d6d3daba241f9a0f5a4c2f2 (patch) | |
| tree | 0c1cb3df99207f96e3278651d8082760c6f414e4 /plugins | |
| parent | c79e5a97a906457d1778197bd4f29640d1917201 (diff) | |
| download | zsh-3ca3c5a126a937dc6d6d3daba241f9a0f5a4c2f2.tar.gz zsh-3ca3c5a126a937dc6d6d3daba241f9a0f5a4c2f2.tar.bz2 zsh-3ca3c5a126a937dc6d6d3daba241f9a0f5a4c2f2.zip | |
don't clobber existing RBENV_ROOT & follow Homebrew's default behavior
Diffstat (limited to 'plugins')
| -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)" |