8890df12510ee39287c6d0669134c29f05e8e56b

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #922 from sbfaulkner/master

patch rbenv support for themes

Diff

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