XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify & consolidate Ruby version reporting.

pull/186/head
Hendrik Mans 2013-01-29 18:44:08 +01:00
parent 2813930e04
commit 77091fe877
1 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
themes/base.theme.bash
View File

@ -18,17 +18,8 @@ SCM_SVN_CHAR='⑆'
SCM_NONE='NONE' SCM_NONE='NONE'
SCM_NONE_CHAR='○' SCM_NONE_CHAR='○'
RVM_THEME_PROMPT_PREFIX=' |' RUBY_THEME_PROMPT_PREFIX=' |'
RVM_THEME_PROMPT_SUFFIX='|' RUBY_THEME_PROMPT_SUFFIX='|'
VIRTUALENV_THEME_PROMPT_PREFIX=' |'
VIRTUALENV_THEME_PROMPT_SUFFIX='|'
RBENV_THEME_PROMPT_PREFIX=' |'
RBENV_THEME_PROMPT_SUFFIX='|'
RBFU_THEME_PROMPT_PREFIX=' |'
RBFU_THEME_PROMPT_SUFFIX='|'
function scm { function scm {
if [[ -f .git/HEAD ]]; then SCM=$SCM_GIT if [[ -f .git/HEAD ]]; then SCM=$SCM_GIT
@ -112,28 +103,8 @@ function hg_prompt_vars {
SCM_CHANGE=$(hg summary 2> /dev/null | grep parent | awk '{print $2}') SCM_CHANGE=$(hg summary 2> /dev/null | grep parent | awk '{print $2}')
} }
function rvm_version_prompt {
if which rvm &> /dev/null; then
rvm=$(rvm tools identifier) || return
echo -e "$RVM_THEME_PROMPT_PREFIX$rvm$RVM_THEME_PROMPT_SUFFIX"
fi
}
function rbenv_version_prompt {
if which rbenv &> /dev/null; then
rbenv=$(rbenv version-name) || return
echo -e "$RBENV_THEME_PROMPT_PREFIX$rbenv$RBENV_THEME_PROMPT_SUFFIX"
fi
}
function rbfu_version_prompt {
if [[ $RBFU_RUBY_VERSION ]]; then
echo -e "${RBFU_THEME_PROMPT_PREFIX}${RBFU_RUBY_VERSION}${RBFU_THEME_PROMPT_SUFFIX}"
fi
}
function ruby_version_prompt { function ruby_version_prompt {
echo -e "$(rbfu_version_prompt)$(rbenv_version_prompt)$(rvm_version_prompt)" echo -e "${RUBY_THEME_PROMPT_PREFIX}$(ruby -v | awk '{print $2}')${RUBY_THEME_PROMPT_SUFFIX}"
} }
function virtualenv_prompt { function virtualenv_prompt {