merge changes from offical repo

This commit is contained in:
Max Masnick 2012-02-25 16:15:40 -05:00
commit 7441438afa
61 changed files with 863 additions and 230 deletions

View file

@ -21,6 +21,15 @@ function box_name {
[ -f ~/.box-name ] && cat ~/.box-name || hostname -s
}
local rvm_ruby=''
if which rvm-prompt &> /dev/null; then
rvm_ruby='$(rvm-prompt i v g)%{$reset_color%}'
else
if which rbenv &> /dev/null; then
rvm_ruby='$(rbenv version | sed -e "s/ (set.*$//")%{$reset_color%}'
fi
fi
local current_dir='${PWD/#$HOME/~}'
local git_info='$(git_prompt_info)'
local prompt_char='$(prompt_char)'