Merge branch 'master' of github.com:Gonzih/oh-my-zsh
Diff
1diff --git a/plugins/vundle/vundle.plugin.zsh b/plugins/vundle/vundle.plugin.zsh
2index d7ab4858d70f5cd2d584ea18966ee2930dbaac1e..005a584769cf24e787b8df3e37402d3bf618c6bc 100644
3--- a/plugins/vundle/vundle.plugin.zsh
4+++ b/plugins/vundle/vundle.plugin.zsh
5@@ -7,6 +7,7 @@ function vundle-init () {
6 if [ ! -d ~/.vim/bundle/vundle/.git/ ]
7 then
8 git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
9+ echo "\n\tRead about vim configuration for vundle at https://github.com/gmarik/vundle\n"
10 fi
11 }
1213diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme
14index 357798cf6a02e5adb615629bc3da9bebd23c505d..3c6b8a409f6de3d5750cacff36edfdaad764e003 100644
15--- a/themes/gnzh.zsh-theme
16+++ b/themes/gnzh.zsh-theme
17@@ -35,9 +35,17 @@ local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
1819 local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}'
20 local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}'
21-local rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
22+local rvm_ruby=''
23+if which rvm-prompt &> /dev/null; then
24+ rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
25+else
26+ if which rbenv &> /dev/null; then
27+ rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
28+ fi
29+fi
30 local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}'
3132+#PROMPT="${user_host} ${current_dir} ${rvm_ruby} ${git_branch}$PR_PROMPT "
33 PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch}
34 ╰─$PR_PROMPT "
35 RPS1="${return_code}"