Merge branch 'master' of github.com:Gonzih/oh-my-zsh

ohmyzsh · Sep 2, 2011 · 8a31ae5 · 8a31ae5
2 parents fe17566 + 7a89786
commit 8a31ae5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/plugins/vundle/vundle.plugin.zsh b/plugins/vundle/vundle.plugin.zsh
@@ -7,6 +7,7 @@ function vundle-init () {
   if [ ! -d ~/.vim/bundle/vundle/.git/ ]
   then
     git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
+    echo "\n\tRead about vim configuration for vundle at https://github.com/gmarik/vundle\n"
   fi
 }
 

diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme
@@ -35,9 +35,17 @@ local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
 
 local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}'
 local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}'
-local rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
+local rvm_ruby=''
+if which rvm-prompt &> /dev/null; then
+  rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
+else
+  if which rbenv &> /dev/null; then
+    rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
+  fi
+fi
 local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}'
 
+#PROMPT="${user_host} ${current_dir} ${rvm_ruby} ${git_branch}$PR_PROMPT "
 PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch}
 ╰─$PR_PROMPT "
 RPS1="${return_code}"