mirror of
				https://github.com/ohmyzsh/ohmyzsh.git
				synced 2024-05-11 05:55:17 +00:00 
			
		
		
		
	Fix checkmark for clean repo in bureau theme
This commit is contained in:
		@@ -23,31 +23,35 @@ bureau_git_branch () {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bureau_git_status () {
 | 
			
		||||
  _INDEX=$(command git status --porcelain -b 2> /dev/null)
 | 
			
		||||
  _STATUS=""
 | 
			
		||||
  if $(echo "$_INDEX" | grep '^[AMRD]. ' &> /dev/null); then
 | 
			
		||||
    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
 | 
			
		||||
  fi
 | 
			
		||||
  if $(echo "$_INDEX" | grep '^.[MTD] ' &> /dev/null); then
 | 
			
		||||
    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
 | 
			
		||||
  fi
 | 
			
		||||
  if $(echo "$_INDEX" | command grep -E '^\?\? ' &> /dev/null); then
 | 
			
		||||
    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
 | 
			
		||||
  fi
 | 
			
		||||
  if $(echo "$_INDEX" | grep '^UU ' &> /dev/null); then
 | 
			
		||||
    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
 | 
			
		||||
  fi
 | 
			
		||||
  if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
 | 
			
		||||
    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED"
 | 
			
		||||
  fi
 | 
			
		||||
  if $(echo "$_INDEX" | grep '^## .*ahead' &> /dev/null); then
 | 
			
		||||
    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
 | 
			
		||||
  fi
 | 
			
		||||
  if $(echo "$_INDEX" | grep '^## .*behind' &> /dev/null); then
 | 
			
		||||
    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_BEHIND"
 | 
			
		||||
  fi
 | 
			
		||||
  if $(echo "$_INDEX" | grep '^## .*diverged' &> /dev/null); then
 | 
			
		||||
    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED"
 | 
			
		||||
  if [[ $(command git status --short 2> /dev/null) != "" ]]; then
 | 
			
		||||
    _INDEX=$(command git status --porcelain -b 2> /dev/null)
 | 
			
		||||
    if $(echo "$_INDEX" | command grep '^[AMRD]. ' &> /dev/null); then
 | 
			
		||||
      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
 | 
			
		||||
    fi
 | 
			
		||||
    if $(echo "$_INDEX" | command grep '^.[MTD] ' &> /dev/null); then
 | 
			
		||||
      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
 | 
			
		||||
    fi
 | 
			
		||||
    if $(echo "$_INDEX" | command grep -E '^\?\? ' &> /dev/null); then
 | 
			
		||||
      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
 | 
			
		||||
    fi
 | 
			
		||||
    if $(echo "$_INDEX" | command grep '^UU ' &> /dev/null); then
 | 
			
		||||
      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
 | 
			
		||||
    fi
 | 
			
		||||
    if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
 | 
			
		||||
      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED"
 | 
			
		||||
    fi
 | 
			
		||||
    if $(echo "$_INDEX" | command grep '^## .*ahead' &> /dev/null); then
 | 
			
		||||
      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
 | 
			
		||||
    fi
 | 
			
		||||
    if $(echo "$_INDEX" | command grep '^## .*behind' &> /dev/null); then
 | 
			
		||||
      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_BEHIND"
 | 
			
		||||
    fi
 | 
			
		||||
    if $(echo "$_INDEX" | command grep '^## .*diverged' &> /dev/null); then
 | 
			
		||||
      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED"
 | 
			
		||||
    fi
 | 
			
		||||
  else
 | 
			
		||||
    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  echo $_STATUS
 | 
			
		||||
@@ -84,10 +88,10 @@ _LIBERTY="$_LIBERTY%{$reset_color%}"
 | 
			
		||||
get_space () {
 | 
			
		||||
  local STR=$1$2
 | 
			
		||||
  local zero='%([BSUbfksu]|([FB]|){*})'
 | 
			
		||||
  local LENGTH=${#${(S%%)STR//$~zero/}} 
 | 
			
		||||
  local LENGTH=${#${(S%%)STR//$~zero/}}
 | 
			
		||||
  local SPACES=""
 | 
			
		||||
  (( LENGTH = ${COLUMNS} - $LENGTH - 1))
 | 
			
		||||
  
 | 
			
		||||
 | 
			
		||||
  for i in {0..$LENGTH}
 | 
			
		||||
    do
 | 
			
		||||
      SPACES="$SPACES "
 | 
			
		||||
@@ -101,7 +105,7 @@ _1RIGHT="[%*] "
 | 
			
		||||
 | 
			
		||||
bureau_precmd () {
 | 
			
		||||
  _1SPACES=`get_space $_1LEFT $_1RIGHT`
 | 
			
		||||
  print 
 | 
			
		||||
  print
 | 
			
		||||
  print -rP "$_1LEFT$_1SPACES$_1RIGHT"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user