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/dallas.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/dallas.zsh-theme')
| -rw-r--r-- | themes/dallas.zsh-theme | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/themes/dallas.zsh-theme b/themes/dallas.zsh-theme index eef32e998..e9b4f852a 100644 --- a/themes/dallas.zsh-theme +++ b/themes/dallas.zsh-theme @@ -3,7 +3,13 @@ # Grab the current date (%D) and time (%T) wrapped in {}: {%D %T} DALLAS_CURRENT_TIME_="%{$fg[white]%}{%{$fg[yellow]%}%D %T%{$fg[white]%}}%{$reset_color%}" # Grab the current version of ruby in use (via RVM): [ruby-1.8.7] -DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}" +if which rvm-prompt &> /dev/null; then + DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}" +else + if which rbenv &> /dev/null; then + DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg[white]%}]%{$reset_color%}" + fi +fi # Grab the current machine name: muscato DALLAS_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}" # Grab the current filepath, use shortcuts: ~/Desktop |