summaryrefslogtreecommitdiff
path: root/themes/dallas.zsh-theme
diff options
context:
space:
mode:
authorMax Masnick <max@masnick.me>2012-02-25 16:15:40 -0500
committerMax Masnick <max@masnick.me>2012-02-25 16:15:40 -0500
commit7441438afa9f96ff1d39a6cd0d8692c2b9044bf2 (patch)
tree508d195705e63c5baff4ed9ead765744feec323f /themes/dallas.zsh-theme
parent9e3776f1ecbaa29d646cdfe8fc204597ca98746c (diff)
parent1120f973054836eeb53750f57d69fbec41a340dc (diff)
downloadzsh-7441438afa9f96ff1d39a6cd0d8692c2b9044bf2.tar.gz
zsh-7441438afa9f96ff1d39a6cd0d8692c2b9044bf2.tar.bz2
zsh-7441438afa9f96ff1d39a6cd0d8692c2b9044bf2.zip
merge changes from offical repo
Diffstat (limited to 'themes/dallas.zsh-theme')
-rw-r--r--themes/dallas.zsh-theme8
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