diff options
| author | hugues <hugues@a0e5b806-a6f9-0310-978d-cbce73f8a913> | 2007-07-25 11:49:00 +0000 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2008-03-07 14:15:15 +0100 |
| commit | f8261b26cec14505fbce132544e25e4d001e4b01 (patch) | |
| tree | 44c956b4c65bbb985c782faa2eb90d31e41fc3a8 | |
| parent | 2060dad3e988021bbb5ea110b78c3caf89a0f0dd (diff) | |
Encore et toujours..
git-svn-id: svn+ssh://hugues@maison/opt/svn/private/hugues@514 a0e5b806-a6f9-0310-978d-cbce73f8a913
| -rw-r--r-- | 11_Prompts.zsh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/11_Prompts.zsh b/11_Prompts.zsh index 3a58059..16fbf97 100644 --- a/11_Prompts.zsh +++ b/11_Prompts.zsh @@ -89,10 +89,10 @@ precmd () DATE=$(date "+%H:%M:%S-%d/%m/%Y") ERROR=%(? "---" "%3<<"$C_$COLOR_BAR$_C"--"$C_$COLOR_ERRR$_C"%?%<<") - if [ $(git status 2>&- | grep -E '^# ([[:alpha:]]+ )+but not( [[:alpha:]]+)+:$' | wc -l) -gt 0 ] ; then COLOR_STATUS=$COLOR_BRANCH\;$YELLOW ; else COLOR_STATUS=$COLOR_BRANCH ; fi - GITBRANCH=${$(git branch 2>&-):+$C_$COLOR_DOUBLEDOT$_C:$C_$COLOR_STATUS$_C$(git branch | grep '^\* ' | cut -c3-)} - if [ $(svn status 2>&- | grep -v '^?' | wc -l) -gt 0 ] ; then COLOR_STATUS=$COLOR_BRANCH\;$YELLOW ; else COLOR_STATUS=$COLOR_BRANCH ; fi SVNREV=${$(svn info 2>&-):+$C_$COLOR_DOUBLEDOT$_C:$C_$COLOR_STATUS$_C"r$(svn info | tail -n+5 | head -n1 | cut -d' ' -f3)"} + if [ $(svn status 2>&- | grep -v '^?' | wc -l) -gt 0 ] ; then COLOR_STATUS=$COLOR_BRANCH\;$YELLOW ; else COLOR_STATUS=$COLOR_BRANCH ; fi + [ "$SVNREV" = "" ] && if [ $(git status 2>&- | grep -E '^# ([[:alpha:]]+ )+but not( [[:alpha:]]+)+:$' | wc -l) -gt 0 ] ; then COLOR_STATUS=$COLOR_BRANCH\;$YELLOW ; else COLOR_STATUS=$COLOR_BRANCH ; fi + GITBRANCH=${$(git branch 2>&-):+$C_$COLOR_DOUBLEDOT$_C:$C_$COLOR_STATUS$_C$(git branch | grep '^\* ' | cut -c3-)} CURDIR=$C_$COLOR_PATH$_C"%(!.%d.%(5~:.../:)%4~)"$C_$VOID$_C"$GITBRANCH$SVNREV" unset HBAR for _hbar in {1..$(($COLUMNS - ${#DATE} - 3 - 2))} |