diff options
| author | Andrew vonderLuft <avonderluft@avlux.net> | 2014-03-14 13:17:43 -0700 |
|---|---|---|
| committer | Andrew vonderLuft <avonderluft@avlux.net> | 2014-03-14 13:17:43 -0700 |
| commit | bf4d4db72b065bff57d75355f49192175364b8a5 (patch) | |
| tree | 4ffa98f99c0919fda9418693d049a4bf7bf290f2 /plugins/rbenv | |
| parent | 8f7971349b653706071bc41e2fdb953bb6f22678 (diff) | |
| parent | ee21fe94473404b58cbaea5b2c279f7a07c34ce1 (diff) | |
| download | zsh-bf4d4db72b065bff57d75355f49192175364b8a5.tar.gz zsh-bf4d4db72b065bff57d75355f49192175364b8a5.tar.bz2 zsh-bf4d4db72b065bff57d75355f49192175364b8a5.zip | |
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into dev
Diffstat (limited to 'plugins/rbenv')
| -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)" |