diff options
| author | Alexander Berezovsky <ab@plumdistrict.com> | 2012-06-28 13:37:00 -0700 |
|---|---|---|
| committer | Alexander Berezovsky <ab@plumdistrict.com> | 2012-06-28 13:37:00 -0700 |
| commit | 34f3d4d4988a8a8f7b5a109f2041923b1f7317e5 (patch) | |
| tree | d5e5fe1d15dca13a270de99fa21406192beb4a87 /plugins/rbenv/rbenv.plugin.zsh | |
| parent | 4a2e9ed0393b74a4e4b42766a5859e6634ce4c65 (diff) | |
| parent | d165a84dc0e8d2eb0774ed26995e7046c0aff41f (diff) | |
| download | zsh-34f3d4d4988a8a8f7b5a109f2041923b1f7317e5.tar.gz zsh-34f3d4d4988a8a8f7b5a109f2041923b1f7317e5.tar.bz2 zsh-34f3d4d4988a8a8f7b5a109f2041923b1f7317e5.zip | |
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/rbenv/rbenv.plugin.zsh')
| -rw-r--r-- | plugins/rbenv/rbenv.plugin.zsh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh index ae37404cd..a62dd5602 100644 --- a/plugins/rbenv/rbenv.plugin.zsh +++ b/plugins/rbenv/rbenv.plugin.zsh @@ -1,5 +1,18 @@ +_homebrew-installed() { + type brew &> /dev/null +} + +_rbenv-from-homebrew-installed() { + brew --prefix rbenv &> /dev/null +} + FOUND_RBENV=0 -for rbenvdir in "$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" ; do +rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv") +if _homebrew-installed && _rbenv-from-homebrew-installed ; then + rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}") +fi + +for rbenvdir in "${rbenvdirs[@]}" ; do if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then FOUND_RBENV=1 export RBENV_ROOT=$rbenvdir |