fix: rbenv: load rbenv when the plugin is loaded

This commit is contained in:
Peter Hoeg 2011-09-29 13:24:28 +08:00
commit 7301257508

View file

@ -1,9 +1,13 @@
if [ -x rbenv ] ; then rbenvdir=$HOME/.rbenv/bin
alias rubies='rbenv versions' if [ -d $rbenvdir ] ; then
alias gemsets='rbenv gemset list' export PATH=$rbenvdir:$PATH
eval "$(rbenv init -)"
current_ruby=$(rbenv active | cut -f1 -d ' ') alias rubies="rbenv versions"
current_gemset=$(rbenv gemset active 2&>/dev/null | grep -v 'no active gemsets') alias gemsets="rbenv gemset list"
current_ruby=$(rbenv version | cut -f1 -d ' ')
current_gemset=$($benv gemset active 2&>/dev/null | grep -v 'no active gemsets')
function gems { function gems {
local rbenv_path=$(rbenv prefix) local rbenv_path=$(rbenv prefix)
@ -15,14 +19,14 @@ if [ -x rbenv ] ; then
} }
function rbenv_prompt_info() { function rbenv_prompt_info() {
if [[ -n $gemset ]] ; then if [[ -n $current_gemset ]] ; then
echo "${ruby_version}@${gemset}" echo "${current_ruby}@${current_gemset}"
else else
echo "${ruby_version}" echo "${current_ruby}"
fi fi
} }
else else
alias rubies='ruby -v' alias rubies='ruby -v'
function gemsets() { echo 'not supported' } function gemsets() { echo 'not supported' }
function rbenv_prompt_info() { echo '' } function rbenv_prompt_info() { echo "system: $(ruby -v | cut -f-2 -d ' ')" }
fi fi