7cc1eab6fa186750c20380963a044630e43d010a
- Author
- Marc Cornellà <marc.cornella@live.com>
- Committer
- Marc Cornellà <marc.cornella@live.com>
- Date
Message
Merge pull request #2752 from isqua/bureau_theme_fix
Fix checkmark for clean repo in bureau theme
Diff
1diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
2index 148abec10e9cb207fac5dc35e2398e9979d688a6..c6296500d06be47e0e57aaa05912f417aa4fda7c 100644
3--- a/themes/bureau.zsh-theme
4+++ b/themes/bureau.zsh-theme
5@@ -23,31 +23,35 @@ bureau_git_branch () {
6 }
7
8 bureau_git_status () {
9- _INDEX=$(command git status --porcelain -b 2> /dev/null)
10 _STATUS=""
11- if $(echo "$_INDEX" | grep '^[AMRD]. ' &> /dev/null); then
12- _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
13- fi
14- if $(echo "$_INDEX" | grep '^.[MTD] ' &> /dev/null); then
15- _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
16- fi
17- if $(echo "$_INDEX" | command grep -E '^\?\? ' &> /dev/null); then
18- _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
19- fi
20- if $(echo "$_INDEX" | grep '^UU ' &> /dev/null); then
21- _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
22- fi
23- if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
24- _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED"
25- fi
26- if $(echo "$_INDEX" | grep '^## .*ahead' &> /dev/null); then
27- _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
28- fi
29- if $(echo "$_INDEX" | grep '^## .*behind' &> /dev/null); then
30- _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_BEHIND"
31- fi
32- if $(echo "$_INDEX" | grep '^## .*diverged' &> /dev/null); then
33- _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED"
34+ if [[ $(command git status --short 2> /dev/null) != "" ]]; then
35+ _INDEX=$(command git status --porcelain -b 2> /dev/null)
36+ if $(echo "$_INDEX" | command grep '^[AMRD]. ' &> /dev/null); then
37+ _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
38+ fi
39+ if $(echo "$_INDEX" | command grep '^.[MTD] ' &> /dev/null); then
40+ _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
41+ fi
42+ if $(echo "$_INDEX" | command grep -E '^\?\? ' &> /dev/null); then
43+ _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
44+ fi
45+ if $(echo "$_INDEX" | command grep '^UU ' &> /dev/null); then
46+ _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
47+ fi
48+ if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
49+ _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED"
50+ fi
51+ if $(echo "$_INDEX" | command grep '^## .*ahead' &> /dev/null); then
52+ _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
53+ fi
54+ if $(echo "$_INDEX" | command grep '^## .*behind' &> /dev/null); then
55+ _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_BEHIND"
56+ fi
57+ if $(echo "$_INDEX" | command grep '^## .*diverged' &> /dev/null); then
58+ _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED"
59+ fi
60+ else
61+ _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
62 fi
63
64 echo $_STATUS
65@@ -84,10 +88,10 @@ _LIBERTY="$_LIBERTY%{$reset_color%}"
66 get_space () {
67 local STR=$1$2
68 local zero='%([BSUbfksu]|([FB]|){*})'
69- local LENGTH=${#${(S%%)STR//$~zero/}}
70+ local LENGTH=${#${(S%%)STR//$~zero/}}
71 local SPACES=""
72 (( LENGTH = ${COLUMNS} - $LENGTH - 1))
73-
74+
75 for i in {0..$LENGTH}
76 do
77 SPACES="$SPACES "
78@@ -101,7 +105,7 @@ _1RIGHT="[%*] "
79
80 bureau_precmd () {
81 _1SPACES=`get_space $_1LEFT $_1RIGHT`
82- print
83+ print
84 print -rP "$_1LEFT$_1SPACES$_1RIGHT"
85 }
86