mirror of
				https://github.com/ohmyzsh/ohmyzsh.git
				synced 2025-11-04 13:21:19 +08:00 
			
		
		
		
	Made my them display the current rvm gemset and check for detached head
state in git.
This commit is contained in:
		
							parent
							
								
									971b071dc6
								
							
						
					
					
						commit
						eb3d1576bf
					
				@ -1,4 +1,4 @@
 | 
			
		||||
PROMPT='%{$fg[blue]%}%n%{$reset_color%} on %{$fg[red]%}%M%{$reset_color%} in %{$fg[blue]%}%~%b%{$reset_color%}$(git_time_since_commit)$(git_prompt_info)
 | 
			
		||||
PROMPT='%{$fg[blue]%}%n%{$reset_color%} on %{$fg[red]%}%M%{$reset_color%} in %{$fg[blue]%}%~%b%{$reset_color%}$(git_time_since_commit)$(check_git_prompt_info)
 | 
			
		||||
$ '
 | 
			
		||||
 | 
			
		||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}"
 | 
			
		||||
@ -16,6 +16,29 @@ ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}"
 | 
			
		||||
ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}"
 | 
			
		||||
ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Git sometimes goes into a detached head state. git_prompt_info doesn't
 | 
			
		||||
# return anything in this case. So wrap it in another function and check
 | 
			
		||||
# for an empty string.
 | 
			
		||||
function check_git_prompt_info() {
 | 
			
		||||
    if git rev-parse --git-dir > /dev/null 2>&1; then
 | 
			
		||||
        if [[ -z $(git_prompt_info) ]]; then
 | 
			
		||||
            echo "%{$fg[magenta]%}detached-head%{$reset_color%})"
 | 
			
		||||
        else
 | 
			
		||||
            echo "$(git_prompt_info)"
 | 
			
		||||
        fi
 | 
			
		||||
    fi
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
# Determine if we are using a gemset.
 | 
			
		||||
function rvm_gemset() {
 | 
			
		||||
    GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
 | 
			
		||||
    if [[ -n $GEMSET ]]; then
 | 
			
		||||
        echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
 | 
			
		||||
    fi 
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
# Determine the time since last commit. If branch is clean,
 | 
			
		||||
# use a neutral color, otherwise colors will vary according to time.
 | 
			
		||||
function git_time_since_commit() {
 | 
			
		||||
@ -49,15 +72,15 @@ function git_time_since_commit() {
 | 
			
		||||
            fi
 | 
			
		||||
 | 
			
		||||
            if [ "$HOURS" -gt 24 ]; then
 | 
			
		||||
                echo "($COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
 | 
			
		||||
                echo "($(rvm_gemset)$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
 | 
			
		||||
            elif [ "$MINUTES" -gt 60 ]; then
 | 
			
		||||
                echo "($COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
 | 
			
		||||
                echo "($(rvm_gemset)$COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|"
 | 
			
		||||
            else
 | 
			
		||||
                echo "($COLOR${MINUTES}m%{$reset_color%}|"
 | 
			
		||||
                echo "($(rvm_gemset)$COLOR${MINUTES}m%{$reset_color%}|"
 | 
			
		||||
            fi
 | 
			
		||||
        else
 | 
			
		||||
            COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
 | 
			
		||||
            echo "($COLOR~|"
 | 
			
		||||
            echo "($(rvm_gemset)$COLOR~|"
 | 
			
		||||
        fi
 | 
			
		||||
    fi
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user