diff options
| author | Max Masnick <max@masnick.me> | 2012-02-25 16:15:40 -0500 |
|---|---|---|
| committer | Max Masnick <max@masnick.me> | 2012-02-25 16:15:40 -0500 |
| commit | 7441438afa9f96ff1d39a6cd0d8692c2b9044bf2 (patch) | |
| tree | 508d195705e63c5baff4ed9ead765744feec323f /themes/alanpeabody.zsh-theme | |
| parent | 9e3776f1ecbaa29d646cdfe8fc204597ca98746c (diff) | |
| parent | 1120f973054836eeb53750f57d69fbec41a340dc (diff) | |
| download | zsh-7441438afa9f96ff1d39a6cd0d8692c2b9044bf2.tar.gz zsh-7441438afa9f96ff1d39a6cd0d8692c2b9044bf2.tar.bz2 zsh-7441438afa9f96ff1d39a6cd0d8692c2b9044bf2.zip | |
merge changes from offical repo
Diffstat (limited to 'themes/alanpeabody.zsh-theme')
| -rw-r--r-- | themes/alanpeabody.zsh-theme | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/themes/alanpeabody.zsh-theme b/themes/alanpeabody.zsh-theme index 1f66f1ec3..4a1b1b386 100644 --- a/themes/alanpeabody.zsh-theme +++ b/themes/alanpeabody.zsh-theme @@ -1,7 +1,14 @@ local user='%{$fg[magenta]%}%n@%{$fg[magenta]%}%m%{$reset_color%}' local pwd='%{$fg[blue]%}%~%{$reset_color%}' -local rvm='%{$fg[green]%}‹$(rvm-prompt i v g)›%{$reset_color%}' +local rvm='' +if which rvm-prompt &> /dev/null; then + rvm='%{$fg[green]%}‹$(rvm-prompt i v g)›%{$reset_color%}' +else + if which rbenv &> /dev/null; then + rvm='%{$fg[green]%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}' + fi +fi local return_code='%(?..%{$fg[red]%}%? ↵%{$reset_color%})' local git_branch='$(git_prompt_status)%{$reset_color%}$(git_prompt_info)%{$reset_color%}' @@ -19,4 +26,3 @@ ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭" PROMPT="${user} ${pwd}$ " RPROMPT="${return_code} ${git_branch} ${rvm}" - |