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

Merge remote-tracking branch 'hmans/rbfu_support'

pull/97/head
Travis Swicegood 2012-01-26 13:32:01 -06:00
parent ea0dc44c53 1be4467429
commit b988a3e628
8 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
themes/base.theme.bash
View File

@ -27,6 +27,9 @@ VIRTUALENV_THEME_PROMPT_SUFFIX='|'
RBENV_THEME_PROMPT_PREFIX=' |' RBENV_THEME_PROMPT_PREFIX=' |'
RBENV_THEME_PROMPT_SUFFIX='|' RBENV_THEME_PROMPT_SUFFIX='|'
RBFU_THEME_PROMPT_PREFIX=' |'
RBFU_THEME_PROMPT_SUFFIX='|'
function scm { function scm {
if [[ -d .git ]]; then SCM=$SCM_GIT if [[ -d .git ]]; then SCM=$SCM_GIT
elif [[ -n "$(git symbolic-ref HEAD 2> /dev/null)" ]]; then SCM=$SCM_GIT elif [[ -n "$(git symbolic-ref HEAD 2> /dev/null)" ]]; then SCM=$SCM_GIT
@ -123,6 +126,16 @@ function rbenv_version_prompt {
fi 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 {
echo -e "$(rbfu_version_prompt)$(rbenv_version_prompt)$(rvm_version_prompt)"
}
function virtualenv_prompt { function virtualenv_prompt {
if which virtualenv &> /dev/null; then if which virtualenv &> /dev/null; then
virtualenv=$([ ! -z "$VIRTUAL_ENV" ] && echo "`basename $VIRTUAL_ENV`") || return virtualenv=$([ ! -z "$VIRTUAL_ENV" ] && echo "`basename $VIRTUAL_ENV`") || return

4
themes/bobby/bobby.theme.bash
View File

@ -13,8 +13,8 @@ RVM_THEME_PROMPT_PREFIX="|"
RVM_THEME_PROMPT_SUFFIX="|" RVM_THEME_PROMPT_SUFFIX="|"
function prompt_command() { function prompt_command() {
#PS1="${bold_cyan}$(scm_char)${green}$(scm_prompt_info)${purple}$(rvm_version_prompt) ${yellow}\h ${reset_color}in ${green}\w ${reset_color}\n${green}→${reset_color} " #PS1="${bold_cyan}$(scm_char)${green}$(scm_prompt_info)${purple}$(ruby_version_prompt) ${yellow}\h ${reset_color}in ${green}\w ${reset_color}\n${green}→${reset_color} "
PS1="\n${yellow}$(rvm_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} " PS1="\n${yellow}$(ruby_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
} }
PROMPT_COMMAND=prompt_command; PROMPT_COMMAND=prompt_command;

2
themes/doubletime/doubletime.theme.bash
View File

@ -50,7 +50,7 @@ function prompt_setter() {
clock=$THEME_PROMPT_CLOCK_FORMAT clock=$THEME_PROMPT_CLOCK_FORMAT
fi fi
PS1=" PS1="
$clock $(scm_char) [$THEME_PROMPT_HOST_COLOR\u@${THEME_PROMPT_HOST}$reset_color] $(virtualenv_prompt)$(rvm_version_prompt)\w $clock $(scm_char) [$THEME_PROMPT_HOST_COLOR\u@${THEME_PROMPT_HOST}$reset_color] $(virtualenv_prompt)$(ruby_version_prompt)\w
$(doubletime_scm_prompt)$reset_color $ " $(doubletime_scm_prompt)$reset_color $ "
PS2='> ' PS2='> '
PS4='+ ' PS4='+ '

2
themes/envy/envy.theme.bash
View File

@ -10,7 +10,7 @@ GIT_THEME_PROMPT_PREFIX=" ${green}|"
GIT_THEME_PROMPT_SUFFIX="${green}|" GIT_THEME_PROMPT_SUFFIX="${green}|"
function prompt_command() { function prompt_command() {
PS1="\n${yellow}$(rbenv_version_prompt)$(rvm_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} " PS1="\n${yellow}$(ruby_version_prompt) ${purple}\h ${reset_color}in ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
} }
PROMPT_COMMAND=prompt_command; PROMPT_COMMAND=prompt_command;

2
themes/hawaii50/hawaii50.theme.bash
View File

@ -98,7 +98,7 @@ function ip_prompt_info() {
# Displays virtual info prompt (virtualenv/rvm) # Displays virtual info prompt (virtualenv/rvm)
function virtual_prompt_info() { function virtual_prompt_info() {
local virtual_env_info=$(virtualenv_prompt) local virtual_env_info=$(virtualenv_prompt)
local rvm_info=$(rvm_version_prompt) local rvm_info=$(ruby_version_prompt)
local virtual_prompt="" local virtual_prompt=""
local prefix=${VIRTUAL_THEME_PROMPT_PREFIX} local prefix=${VIRTUAL_THEME_PROMPT_PREFIX}

2
themes/pete/pete.theme.bash
View File

@ -5,7 +5,7 @@ prompt_setter() {
history -a history -a
history -c history -c
history -r history -r
PS1="(\t) $(scm_char) [$blue\u$reset_color@$green\H$reset_color] $yellow\w${reset_color}$(scm_prompt_info)$(rvm_version_prompt) $reset_color " PS1="(\t) $(scm_char) [$blue\u$reset_color@$green\H$reset_color] $yellow\w${reset_color}$(scm_prompt_info)$(ruby_version_prompt) $reset_color "
PS2='> ' PS2='> '
PS4='+ ' PS4='+ '
} }

4
themes/rainbowbrite/rainbowbrite.theme.bash
View File

@ -11,9 +11,9 @@ prompt_setter() {
history -c history -c
history -r history -r
# displays user@server in purple # displays user@server in purple
# PS1="$red$(scm_char) $purple\u@\h$reset_color:$blue\w$yellow$(scm_prompt_info)$(rvm_version_prompt) $black\$$reset_color " # PS1="$red$(scm_char) $purple\u@\h$reset_color:$blue\w$yellow$(scm_prompt_info)$(ruby_version_prompt) $black\$$reset_color "
# no user@server # no user@server
PS1="$red$(scm_char) $blue\w$yellow$(scm_prompt_info)$(rvm_version_prompt) $black\$$reset_color " PS1="$red$(scm_char) $blue\w$yellow$(scm_prompt_info)$(ruby_version_prompt) $black\$$reset_color "
PS2='> ' PS2='> '
PS4='+ ' PS4='+ '
} }

2
themes/tylenol/tylenol.theme.bash
View File

@ -14,7 +14,7 @@ VIRTUALENV_THEME_PROMPT_PREFIX='|'
VIRTUALENV_THEME_PROMPT_SUFFIX='|' VIRTUALENV_THEME_PROMPT_SUFFIX='|'
function prompt_command() { function prompt_command() {
PS1="\n${green}$(virtualenv_prompt)${red}$(rvm_version_prompt) ${reset_color}\h ${orange}in ${reset_color}\w\n${yellow}$(scm_char)$(scm_prompt_info) ${yellow}→${white} " PS1="\n${green}$(virtualenv_prompt)${red}$(ruby_version_prompt) ${reset_color}\h ${orange}in ${reset_color}\w\n${yellow}$(scm_char)$(scm_prompt_info) ${yellow}→${white} "
} }
PROMPT_COMMAND=prompt_command; PROMPT_COMMAND=prompt_command;