Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 8a31ae51370ad53a1d02f8d32ca02d8093acea48 2 parents fe17566 + 7a89786
@Gonzih Gonzih authored
Showing with 10 additions and 1 deletion.
  1. +1 −0  plugins/vundle/vundle.plugin.zsh
  2. +9 −1 themes/gnzh.zsh-theme
View
1  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
}
View
10 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}"
Please sign in to comment.
Something went wrong with that request. Please try again.