diff options
| author | Henry Yan <yanhonglei@gmail.com> | 2012-07-17 00:36:50 +0800 |
|---|---|---|
| committer | Henry Yan <yanhonglei@gmail.com> | 2012-07-17 00:36:50 +0800 |
| commit | 4a11d2c35c7a526e648b37a5b02b7695be46b16a (patch) | |
| tree | 1eb542466758885ee40f3f60cc57d6438f38dc4d /plugins/rbenv/rbenv.plugin.zsh | |
| parent | e9feccf6a94f9f5238ff0b3501f62575d14ae148 (diff) | |
| parent | 11034217a7ea3cffe6e0fe631837c518b8c7e1a5 (diff) | |
| download | zsh-4a11d2c35c7a526e648b37a5b02b7695be46b16a.tar.gz zsh-4a11d2c35c7a526e648b37a5b02b7695be46b16a.tar.bz2 zsh-4a11d2c35c7a526e648b37a5b02b7695be46b16a.zip | |
merge from upstream master
Diffstat (limited to 'plugins/rbenv/rbenv.plugin.zsh')
| -rw-r--r-- | plugins/rbenv/rbenv.plugin.zsh | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh index ae37404cd..d855c2445 100644 --- a/plugins/rbenv/rbenv.plugin.zsh +++ b/plugins/rbenv/rbenv.plugin.zsh @@ -1,10 +1,23 @@ +_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 export PATH=${rbenvdir}/bin:$PATH - eval "$(rbenv init -)" + eval "$(rbenv init - zsh)" alias rubies="rbenv versions" alias gemsets="rbenv gemset list" |