Introduce $(ruby_version_prompt), wrapping around rbfu, rbenv and RVM support.
authorHendrik Mans <hendrik@mans.de>
Tue, 24 Jan 2012 13:31:23 +0000 (14:31 +0100)
committerHendrik Mans <hendrik@mans.de>
Tue, 24 Jan 2012 13:31:23 +0000 (14:31 +0100)
themes/base.theme.bash
themes/envy/envy.theme.bash

index b763121..503fc57 100644 (file)
@@ -132,6 +132,10 @@ function rbfu_version_prompt {
   fi
 }
 
+function ruby_version_prompt {
+  echo -e "$(rbfu_version_prompt)$(rbenv_version_prompt)$(rvm_version_prompt)"
+}
+
 function virtualenv_prompt {
   if which virtualenv &> /dev/null; then
     virtualenv=$([ ! -z "$VIRTUAL_ENV" ] && echo "`basename $VIRTUAL_ENV`") || return
index e9b7081..d2f6a00 100644 (file)
@@ -10,7 +10,7 @@ GIT_THEME_PROMPT_PREFIX=" ${green}|"
 GIT_THEME_PROMPT_SUFFIX="${green}|"
 
 function prompt_command() {
-    PS1="\n${yellow}$(rbfu_version_prompt)$(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;