From aa56e2ad01977a4bf1237721a7aa089b1990e3bd Mon Sep 17 00:00:00 2001 From: Travis Swicegood Date: Sat, 23 Jul 2011 21:42:02 -0500 Subject: [PATCH 1/4] ditch custom virtualenv_prompt in favor of one in base --- themes/doubletime/doubletime.theme.bash | 7 ------- 1 file changed, 7 deletions(-) diff --git a/themes/doubletime/doubletime.theme.bash b/themes/doubletime/doubletime.theme.bash index e16ba66c..997b3f24 100644 --- a/themes/doubletime/doubletime.theme.bash +++ b/themes/doubletime/doubletime.theme.bash @@ -26,13 +26,6 @@ doubletime_scm_prompt() { fi } -virtualenv_prompt() { - if [ ! -z "$VIRTUAL_ENV" ] - then - echo "(`basename $VIRTUAL_ENV`) " - fi -} - function prompt_setter() { # Save history history -a From 1251c20a5825a6fa9461a03b42ec27d2ddc8491d Mon Sep 17 00:00:00 2001 From: Travis Swicegood Date: Sat, 23 Jul 2011 21:42:22 -0500 Subject: [PATCH 2/4] add rvm to prompt --- themes/doubletime/doubletime.theme.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/doubletime/doubletime.theme.bash b/themes/doubletime/doubletime.theme.bash index 997b3f24..0ec8497c 100644 --- a/themes/doubletime/doubletime.theme.bash +++ b/themes/doubletime/doubletime.theme.bash @@ -38,7 +38,7 @@ function prompt_setter() { clock=$THEME_PROMPT_CLOCK_FORMAT fi PS1=" -$clock $(scm_char) [$THEME_PROMPT_HOST_COLOR\u@${THEME_PROMPT_HOST}$reset_color] $(virtualenv_prompt)\w +$clock $(scm_char) [$THEME_PROMPT_HOST_COLOR\u@${THEME_PROMPT_HOST}$reset_color] $(virtualenv_prompt)$(rvm_version_prompt)\w $(doubletime_scm_prompt)$reset_color $ " PS2='> ' PS4='+ ' From 11995c1c1d6623c8aabbce356988e9f7bcec5fba Mon Sep 17 00:00:00 2001 From: Travis Swicegood Date: Sat, 23 Jul 2011 21:42:48 -0500 Subject: [PATCH 3/4] make sure its obvious which is ruby and which is python --- themes/doubletime/doubletime.theme.bash | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/themes/doubletime/doubletime.theme.bash b/themes/doubletime/doubletime.theme.bash index 0ec8497c..17def320 100644 --- a/themes/doubletime/doubletime.theme.bash +++ b/themes/doubletime/doubletime.theme.bash @@ -6,8 +6,10 @@ SCM_SVN_CHAR="${bold_cyan}⑆${normal}" SCM_HG_CHAR="${bold_red}☿${normal}" SCM_THEME_PROMPT_PREFIX="" SCM_THEME_PROMPT_SUFFIX="" -RVM_THEME_PROMPT_PREFIX=" (" -RVM_THEME_PROMPT_SUFFIX=")" +RVM_THEME_PROMPT_PREFIX="(rb: " +RVM_THEME_PROMPT_SUFFIX=") " +VIRTUALENV_THEME_PROMPT_PREFIX="(py: " +VIRTUALENV_THEME_PROMPT_SUFFIX=") " if [ ! -z $THEME_PROMPT_HOST_COLOR ]; then THEME_PROMPT_HOST_COLOR=$(eval echo $`echo ${THEME_PROMPT_HOST_COLOR}`); From 41ca567f95496d290b3fc3311c2220975ae47731 Mon Sep 17 00:00:00 2001 From: Travis Swicegood Date: Sat, 23 Jul 2011 21:48:07 -0500 Subject: [PATCH 4/4] add color to the prefix --- themes/doubletime/doubletime.theme.bash | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/themes/doubletime/doubletime.theme.bash b/themes/doubletime/doubletime.theme.bash index 17def320..c3bf453d 100644 --- a/themes/doubletime/doubletime.theme.bash +++ b/themes/doubletime/doubletime.theme.bash @@ -6,9 +6,19 @@ SCM_SVN_CHAR="${bold_cyan}⑆${normal}" SCM_HG_CHAR="${bold_red}☿${normal}" SCM_THEME_PROMPT_PREFIX="" SCM_THEME_PROMPT_SUFFIX="" -RVM_THEME_PROMPT_PREFIX="(rb: " +if [ ! -z $RVM_THEME_PROMPT_COLOR ]; then + RVM_THEME_PROMPT_COLOR=$(eval echo $`echo ${RVM_THEME_PROMPT_COLOR}`); +else + RVM_THEME_PROMPT_COLOR="${red}" +fi +RVM_THEME_PROMPT_PREFIX="(${RVM_THEME_PROMPT_COLOR}rb${normal}: " RVM_THEME_PROMPT_SUFFIX=") " -VIRTUALENV_THEME_PROMPT_PREFIX="(py: " +if [ ! -z $VIRTUALENV_THEME_PROMPT_COLOR ]; then + VIRTUALENV_THEME_PROMPT_COLOR=$(eval echo $`echo ${VIRTUALENV_THEME_PROMPT_COLOR}`); +else + VIRTUALENV_THEME_PROMPT_COLOR="${green}" +fi +VIRTUALENV_THEME_PROMPT_PREFIX="(${VIRTUALENV_THEME_PROMPT_COLOR}py${normal}: " VIRTUALENV_THEME_PROMPT_SUFFIX=") " if [ ! -z $THEME_PROMPT_HOST_COLOR ]; then