diff options
| author | fred-o <fredrik.appelberg@gmail.com> | 2012-02-20 09:41:45 +0100 |
|---|---|---|
| committer | fred-o <fredrik.appelberg@gmail.com> | 2012-02-20 09:41:45 +0100 |
| commit | 7e5dda7f434b847e4a8899beb736a7251da3d390 (patch) | |
| tree | 45eccafa617e7e3ec4e7e97ff7569b157786dd6c /themes/crunch.zsh-theme | |
| parent | f5041025844a2509f42e0bb19cb8d5418340e10c (diff) | |
| parent | 362927003bcd8052e294dcbdf14f061ef4f2e173 (diff) | |
| download | zsh-7e5dda7f434b847e4a8899beb736a7251da3d390.tar.gz zsh-7e5dda7f434b847e4a8899beb736a7251da3d390.tar.bz2 zsh-7e5dda7f434b847e4a8899beb736a7251da3d390.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
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➭ " |