diff options
| author | Max Gonzih <gonzih@gmail.com> | 2011-09-02 16:07:12 +0300 |
|---|---|---|
| committer | Max Gonzih <gonzih@gmail.com> | 2011-09-02 16:07:12 +0300 |
| commit | 8a31ae51370ad53a1d02f8d32ca02d8093acea48 (patch) | |
| tree | 5d17967fd45ae5b81dbbf14b1ec2bbc2ad5eeed3 | |
| parent | fe175661fddd04691cc03012f84490e729cf2bae (diff) | |
| parent | 7a89786139bcfd83e0e9caa9974f66a423c6ed48 (diff) | |
| download | zsh-8a31ae51370ad53a1d02f8d32ca02d8093acea48.tar.gz zsh-8a31ae51370ad53a1d02f8d32ca02d8093acea48.tar.bz2 zsh-8a31ae51370ad53a1d02f8d32ca02d8093acea48.zip | |
Merge branch 'master' of github.com:Gonzih/oh-my-zsh
| -rw-r--r-- | plugins/vundle/vundle.plugin.zsh | 1 | ||||
| -rw-r--r-- | themes/gnzh.zsh-theme | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/plugins/vundle/vundle.plugin.zsh b/plugins/vundle/vundle.plugin.zsh index d7ab4858d..005a58476 100644 --- 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 index 357798cf6..3c6b8a409 100644 --- 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}" |