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

Added virtualenv_prompt to base.theme.bash (modeled after rvm_prompt) 

Removed virtualenv/rvm from hawaii50 theme
pull/54/head
Ryan 2011-06-08 11:32:50 -10:00
parent c7fcf20648
commit 0713fdc031
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
themes/base.theme.bash
View File

@ -20,6 +20,9 @@ SCM_NONE_CHAR='○'
RVM_THEME_PROMPT_PREFIX=' |' RVM_THEME_PROMPT_PREFIX=' |'
RVM_THEME_PROMPT_SUFFIX='|' RVM_THEME_PROMPT_SUFFIX='|'
VIRTUALENV_THEME_PROMPT_PREFIX=' |'
VIRTUALENV_THEME_PROMPT_SUFFIX='|'
function scm { function scm {
if [[ -d .git ]]; then SCM=$GIT if [[ -d .git ]]; then SCM=$GIT
elif [[ -n "$(git symbolic-ref HEAD 2> /dev/null)" ]]; then SCM=$GIT elif [[ -n "$(git symbolic-ref HEAD 2> /dev/null)" ]]; then SCM=$GIT
@ -85,3 +88,10 @@ function rvm_version_prompt {
echo -e "$RVM_THEME_PROMPT_PREFIX$rvm$RVM_THEME_PROMPT_SUFFIX" echo -e "$RVM_THEME_PROMPT_PREFIX$rvm$RVM_THEME_PROMPT_SUFFIX"
fi fi
} }
function virtualenv_prompt {
if which virtualenv &> /dev/null; then
virtualenv=$([ ! -z "$VIRTUAL_ENV" ] && echo "`basename $VIRTUAL_ENV`") || return
echo -e "$VIRTUALENV_THEME_PROMPT_PREFIX$virtualenv$VIRTUALENV_THEME_PROMPT_SUFFIX"
fi
}

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

@ -50,8 +50,14 @@ REF_COLOR='\[${purple}\]'
# SCM prompts # SCM prompts
SCM_THEME_PROMPT_DIRTY=' ${bold_red}✗${normal}' SCM_THEME_PROMPT_DIRTY=' ${bold_red}✗${normal}'
SCM_THEME_PROMPT_CLEAN=' ${bold_green}✓${normal}' SCM_THEME_PROMPT_CLEAN=' ${bold_green}✓${normal}'
SCM_THEME_PROMPT_PREFIX=" " SCM_THEME_PROMPT_PREFIX=' '
SCM_THEME_PROMPT_SUFFIX="" SCM_THEME_PROMPT_SUFFIX=''
RVM_THEME_PROMPT_PREFIX=''
RVM_THEME_PROMPT_SUFFIX=''
VIRTUALENV_THEME_PROMPT_PREFIX=''
VIRTUALENV_THEME_PROMPT_SUFFIX=''
# Max length of PWD to display # Max length of PWD to display
MAX_PWD_LENGTH=20 MAX_PWD_LENGTH=20
@ -66,26 +72,10 @@ function ip {
echo $(ifconfig en1 | grep "inet " | awk '{ print $2 }') echo $(ifconfig en1 | grep "inet " | awk '{ print $2 }')
} }
# Displays the current virtualenv information
function curr_virtualenv_info() {
[ ! -z "$VIRTUAL_ENV" ] && echo "`basename $VIRTUAL_ENV`"
}
# Displays the current rvm information w/gemset
function curr_rvm_info() {
local ruby_version=$(echo $MY_RUBY_HOME | awk -F'-' '{print $2}')
local ruby_gemset=$(echo $GEM_HOME | awk -F'@' '{print $2}')
if [ "$ruby_version" != "" ]; then
[ "$ruby_gemset" != "" ] && ruby_gemset="@$ruby_gemset"
echo "$ruby_version$ruby_gemset"
fi
}
# Displays using ... # Displays using ...
function virtual_info() { function virtual_info() {
local virtual_env_info=$(curr_virtualenv_info) local virtual_env_info=$(virtualenv_prompt)
local rvm_info=$(curr_rvm_info) local rvm_info=$(rvm_version_prompt)
# If no virtual info, just return # If no virtual info, just return
[ "$virtual_env_info" == "" -a "$rvm_info" == "" ] && return [ "$virtual_env_info" == "" -a "$rvm_info" == "" ] && return