浏览代码

Simplified gallois RPS1 setup using some helpful scripts

Daniel Farrell 10 年之前
父节点
当前提交
b2ce306c4f
共有 1 个文件被更改,包括 6 次插入14 次删除
  1. 6 14
      themes/gallois.zsh-theme

+ 6 - 14
themes/gallois.zsh-theme

@@ -11,19 +11,11 @@ git_custom_status() {
   fi
 }
 
-#RVM and git settings
-if [[ -s ~/.rvm/scripts/rvm ]] ; then
-  RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1'
-else
-  if which rbenv &> /dev/null; then
-    RPS1='$(git_custom_status)%{$fg[red]%}[`rbenv version | sed -e "s/ (set.*$//"`]%{$reset_color%} $EPS1'
-  else
-    if [[ -n `which chruby_prompt_info &> /dev/null` && -n `chruby_prompt_info` ]]; then
-      RPS1='$(git_custom_status)%{$fg[red]%}[`chruby_prompt_info`]%{$reset_color%} $EPS1'
-    else
-      RPS1='$(git_custom_status) $EPS1'
-    fi
-  fi
-fi
+# RVM component of prompt
+ZSH_THEME_RVM_PROMPT_PREFIX="%{$fg[red]%}["
+ZSH_THEME_RVM_PROMPT_SUFFIX="]%{$reset_color%}"
+
+# Combine it all into a final right-side prompt
+RPS1='$(git_custom_status)$(ruby_prompt_info) $EPS1'
 
 PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '