adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #995 from wting/fix_gnzh_ruby_detection

Browse Source 
Fix gnzh theme to detect local rvm installations
This commit is contained in:
Robby Russell 2014-03-22 15:40:00 -07:00
commit ae1a9e25a1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
themes/gnzh.zsh-theme
View File

@ -6,7 +6,7 @@ autoload -U colors zsh/terminfo # Used in the colour alias below
colors colors
setopt prompt_subst setopt prompt_subst
# make some aliases for the colours: (coud use normal escap.seq's too) # make some aliases for the colours: (could use normal escape sequences too)
for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
eval PR_$color='%{$fg[${(L)color}]%}' eval PR_$color='%{$fg[${(L)color}]%}'
done done
@ -25,7 +25,7 @@ elif [[ $UID -eq 0 ]]; then # root
fi fi
# Check if we are on SSH or not # Check if we are on SSH or not
if [[ -n "$SSH_CLIENT" || -n "$SSH2_CLIENT" ]]; then if [[ -n "$SSH_CLIENT" || -n "$SSH2_CLIENT" ]]; then
eval PR_HOST='${PR_YELLOW}%M${PR_NO_COLOR}' #SSH eval PR_HOST='${PR_YELLOW}%M${PR_NO_COLOR}' #SSH
else else
eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' # no SSH eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' # no SSH
@ -36,12 +36,12 @@ 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='' local rvm_ruby=''
if which rvm-prompt &> /dev/null; then if ${HOME}/.rvm/bin/rvm-prompt &> /dev/null; then # detect local user rvm installation
rvm_ruby='%{$PR_RED%}‹$(${HOME}/.rvm/bin/rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
elif which rvm-prompt &> /dev/null; then # detect sysem-wide rvm installation
rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}' rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
else elif which rbenv &> /dev/null; then # detect Simple Ruby Version management
if which rbenv &> /dev/null; then rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
fi
fi fi
local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}' local git_branch='$(git_prompt_info)%{$PR_NO_COLOR%}'