b62a3e89602bca23b794dd1e808d92a89880ad3f

Author
Brent Faulkner <brent.faulkner@mosaic.com>
Committer
Brent Faulkner <brent.faulkner@mosaic.com>
Date

Message

handle case where ~/.rvm/bin/rvm-prompt is not in path, so "which" can't find it

Diff

 1diff --git a/themes/crunch.zsh-theme b/themes/crunch.zsh-theme
 2index b2759a1b0fe9d7f05b04f34baac42de073b8092a..2fc066381ca13d0a7f40f548bf957bdeedd0093f 100644
 3--- a/themes/crunch.zsh-theme
 4+++ b/themes/crunch.zsh-theme
 5@@ -29,7 +29,7 @@ ZSH_THEME_GIT_PROMPT_DIRTY=" $CRUNCH_GIT_DIRTY_COLOR✗"
 6 
 7 # Our elements:
 8 CRUNCH_TIME_="$CRUNCH_BRACKET_COLOR{$CRUNCH_TIME_COLOR%T$CRUNCH_BRACKET_COLOR}%{$reset_color%}"
 9-if which rvm-prompt &> /dev/null; then
10+if [ -e ~/.rvm/bin/rvm-prompt ]; then
11   CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\${\$(~/.rvm/bin/rvm-prompt i v g)#ruby-}$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}"
12 else
13   if which rbenv &> /dev/null; then
14diff --git a/themes/dallas.zsh-theme b/themes/dallas.zsh-theme
15index e9b4f852a36d45c65e634b9209da8d40f95867de..02285df526457e74e6fe71a087561a76f5540695 100644
16--- a/themes/dallas.zsh-theme
17+++ b/themes/dallas.zsh-theme
18@@ -3,7 +3,7 @@
19 # Grab the current date (%D) and time (%T) wrapped in {}: {%D %T}
20 DALLAS_CURRENT_TIME_="%{$fg[white]%}{%{$fg[yellow]%}%D %T%{$fg[white]%}}%{$reset_color%}"
21 # Grab the current version of ruby in use (via RVM): [ruby-1.8.7]
22-if which rvm-prompt &> /dev/null; then
23+if [ -e ~/.rvm/bin/rvm-prompt ]; then
24   DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
25 else
26   if which rbenv &> /dev/null; then
27diff --git a/themes/macovsky-ruby.zsh-theme b/themes/macovsky-ruby.zsh-theme
28index 0453767613524b9b8d55ad480db8232d0628d438..69d80d588448eafb5a50d50714897a6d0a17fcf5 100644
29--- a/themes/macovsky-ruby.zsh-theme
30+++ b/themes/macovsky-ruby.zsh-theme
31@@ -1,7 +1,7 @@
32 # ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
33 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
34 
35-if which rvm-prompt &> /dev/null; then
36+if [ -e ~/.rvm/bin/rvm-prompt ]; then
37   PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
38 else
39   if which rbenv &> /dev/null; then
40diff --git a/themes/macovsky.zsh-theme b/themes/macovsky.zsh-theme
41index b6978b9290fce5b6a5b27509cdcef12c9d507e0a..2e6dce42d164c04b0ccbecc6b75bac8fb589653b 100644
42--- a/themes/macovsky.zsh-theme
43+++ b/themes/macovsky.zsh-theme
44@@ -1,7 +1,7 @@
45 # ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
46 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
47 
48-if which rvm-prompt &> /dev/null; then
49+if [ -e ~/.rvm/bin/rvm-prompt ]; then
50   PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
51 else
52   if which rbenv &> /dev/null; then
53diff --git a/themes/superjarin.zsh-theme b/themes/superjarin.zsh-theme
54index 0be816de0af852876b34a9ee817a81cd7fc97f4e..86955a5605f01c1ab1e460b0a9a2ad743a9f61dd 100644
55--- a/themes/superjarin.zsh-theme
56+++ b/themes/superjarin.zsh-theme
57@@ -1,5 +1,5 @@
58 # Grab the current version of ruby in use (via RVM): [ruby-1.8.7]
59-if which rvm-prompt &> /dev/null; then
60+if [ -e ~/.rvm/bin/rvm-prompt ]; then
61   JARIN_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
62 else
63   if which rbenv &> /dev/null; then
64diff --git a/themes/zhann.zsh-theme b/themes/zhann.zsh-theme
65index 574e0cec3b17b8549d4a66dc81b8b0b8a2262b8e..5c49fe79b5e769bff7711c8f2d27b89d67005a5b 100644
66--- a/themes/zhann.zsh-theme
67+++ b/themes/zhann.zsh-theme
68@@ -1,6 +1,6 @@
69 PROMPT='%{$fg_bold[green]%}%p %{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
70 
71-if which rvm-prompt &> /dev/null; then
72+if [ -e ~/.rvm/bin/rvm-prompt ]; then
73   RPROMPT='%{$reset_color%} %{$fg[red]%}$(~/.rvm/bin/rvm-prompt i v g) %{$reset_color%}'
74 else
75   if which rbenv &> /dev/null; then