Merge branch 'master' of github.com:Gonzih/oh-my-zsh
This commit is contained in:
commit
8a31ae5137
@ -7,6 +7,7 @@ function vundle-init () {
|
|||||||
if [ ! -d ~/.vim/bundle/vundle/.git/ ]
|
if [ ! -d ~/.vim/bundle/vundle/.git/ ]
|
||||||
then
|
then
|
||||||
git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
|
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
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,9 +35,17 @@ local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
|
|||||||
|
|
||||||
local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}'
|
local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}'
|
||||||
local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}'
|
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%}'
|
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}
|
PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch}
|
||||||
╰─$PR_PROMPT "
|
╰─$PR_PROMPT "
|
||||||
RPS1="${return_code}"
|
RPS1="${return_code}"
|
||||||
|
Loading…
Reference in New Issue
Block a user