From 09bd0ef5d04660b33aa76ba96c916b3efe0032e8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Jun 2011 13:34:27 -1000 Subject: [PATCH] Um, what was I thinking. Removed SCM_PROMPT_PREFIX and custom scm_info. (No need for it). --- themes/hawaii50/hawaii50.theme.bash | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/themes/hawaii50/hawaii50.theme.bash b/themes/hawaii50/hawaii50.theme.bash index 3dc77bc..946b808 100644 --- a/themes/hawaii50/hawaii50.theme.bash +++ b/themes/hawaii50/hawaii50.theme.bash @@ -50,7 +50,7 @@ REF_COLOR='\[${purple}\]' # SCM prompts SCM_THEME_PROMPT_DIRTY=' ${bold_red}✗${normal}' SCM_THEME_PROMPT_CLEAN=' ${bold_green}✓${normal}' -SCM_THEME_PROMPT_PREFIX=' ' +SCM_THEME_PROMPT_PREFIX=' on ' SCM_THEME_PROMPT_SUFFIX='' RVM_THEME_PROMPT_PREFIX='' @@ -59,9 +59,6 @@ RVM_THEME_PROMPT_SUFFIX='' VIRTUALENV_THEME_PROMPT_PREFIX='' VIRTUALENV_THEME_PROMPT_SUFFIX='' -SCM_PROMPT_PREFIX=' on' -SCM_PROMPT_SUFFIX='' - # Max length of PWD to display MAX_PWD_LENGTH=20 @@ -96,12 +93,6 @@ function virtual_info() { echo "$prompt" } -# SCM information -function h50_scm_prompt_info() { - local scm_prompt=$(scm_prompt_info) - [[ -n "$scm_prompt" ]] && echo -e "$SCM_PROMPT_PREFIX$scm_prompt$SCM_PROMPT_SUFFIX" -} - # Parse git info function git_prompt_info() { if [[ -n $(git status -s 2> /dev/null |grep -v ^# |grep -v "working directory clean") ]]; then @@ -171,7 +162,7 @@ function prompt() { local UC=$USER_COLOR [ $UID -eq "0" ] && UC=$SUPERUSER_COLOR - PS1="$(scm_char) ${UC}\u ${DEFAULT_COLOR}at ${MACHINE_COLOR}\h ${DEFAULT_COLOR}(${IP_COLOR}$(ip)${DEFAULT_COLOR})${DEFAULT_COLOR} in ${DIRECTORY_COLOR}$(limited_pwd)${DEFAULT_COLOR}$(virtual_info)$(h50_scm_prompt_info) \$ " + PS1="$(scm_char) ${UC}\u ${DEFAULT_COLOR}at ${MACHINE_COLOR}\h ${DEFAULT_COLOR}(${IP_COLOR}$(ip)${DEFAULT_COLOR})${DEFAULT_COLOR} in ${DIRECTORY_COLOR}$(limited_pwd)${DEFAULT_COLOR}$(virtual_info)$(scm_prompt_info) \$ " PS2='> ' PS4='+ ' } -- 2.17.1