change: make it work even without rbenv active

This commit is contained in:
Peter Hoeg 2011-09-29 12:40:33 +08:00
commit b6bc30edc2

View file

@ -1,24 +1,28 @@
alias rubies='rbenv versions' if [ -x rbenv ] ; then
alias gemsets='rbenv gemset list' alias rubies='rbenv versions'
alias gemsets='rbenv gemset list'
# TODO: Make this usable w/o rbenv. current_ruby=$(rbenv active | cut -f1 -d ' ')
function gems { current_gemset=$(rbenv gemset active 2&>/dev/null | grep -v 'no active gemsets')
local current_ruby=`rbenv active | cut -f1 -d ' '`
local current_gemset=`rbenv gemset active | grep -v 'no active gemsets'`
function gems {
local rbenv_path=$(rbenv prefix)
gem list $@ | sed \ gem list $@ | sed \
-Ee "s/\([0-9\.]+( .+)?\)/$fg[blue]&$reset_color/g" \ -Ee "s/\([0-9\.]+( .+)?\)/$fg[blue]&$reset_color/g" \
-Ee "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \ -Ee "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
-Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \ -Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
-Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g" -Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
} }
function rbenv_prompt_info() { function rbenv_prompt_info() {
ruby_version=$(rbenv version | cut -f1 -d ' ') || return
gemset=$(rbenv gemset active 2&>/dev/null | grep -v 'no active gemsets')
if [[ -n $gemset ]] ; then if [[ -n $gemset ]] ; then
echo "${ruby_version}@${gemset}" echo "${ruby_version}@${gemset}"
else else
echo "${ruby_version}" echo "${ruby_version}"
fi fi
} }
else
alias rubies='ruby -v'
function gemsets() { echo 'not supported' }
function rbenv_prompt_info() { echo '' }
fi