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/crunch.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/crunch.zsh-theme')
| -rw-r--r-- | themes/crunch.zsh-theme | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/themes/crunch.zsh-theme b/themes/crunch.zsh-theme index 2473cd230..b2759a1b0 100644 --- a/themes/crunch.zsh-theme +++ b/themes/crunch.zsh-theme @@ -29,7 +29,13 @@ ZSH_THEME_GIT_PROMPT_DIRTY=" $CRUNCH_GIT_DIRTY_COLOR✗" # Our elements: CRUNCH_TIME_="$CRUNCH_BRACKET_COLOR{$CRUNCH_TIME_COLOR%T$CRUNCH_BRACKET_COLOR}%{$reset_color%}" -CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\${\$(~/.rvm/bin/rvm-prompt i v g)#ruby-}$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}" +if which rvm-prompt &> /dev/null; then + CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\${\$(~/.rvm/bin/rvm-prompt i v g)#ruby-}$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}" +else + if which rbenv &> /dev/null; then + CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\${\$(rbenv version | sed -e 's/ (set.*$//' -e 's/^ruby-//')}$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}" + fi +fi CRUNCH_DIR_="$CRUNCH_DIR_COLOR%~\$(git_prompt_info) " CRUNCH_PROMPT="$CRUNCH_BRACKET_COLOR➭ " |