diff options
| author | Hugues Hiegel <hugues@hiegel.fr> | 2011-09-29 15:46:48 +0200 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2011-09-29 15:46:48 +0200 |
| commit | 3424f617d79d73bccb39716aa0e785575eea3dbc (patch) | |
| tree | d5269cb64caa2b74ab7f445600d61301940e3ab6 | |
| parent | 0485dc4e976b22d58d268b7d388d9cc0ba9aa8d4 (diff) | |
| parent | 6408c507f40f42b6751554549f3b02f4017df804 (diff) | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | 12_Prompts.zsh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/12_Prompts.zsh b/12_Prompts.zsh index 5b01780..aa0fc38 100644 --- a/12_Prompts.zsh +++ b/12_Prompts.zsh @@ -231,7 +231,7 @@ update_prompt_elements() SVNREVSIZE=${#${SVNREV:+ r$SVNREV}} if [ "$SVNREV" != "" ] then - if [ -z "$DO_NOT_CHECK_SVN_STATUS" ] + if [ ! -z "$CHECK_SVN_STATUS" ] then SVNSTATUS="$(svn diff 2>&-)" SVNSTATUS=${${SVNSTATUS:+$prompt_colors[not_up_to_date]}:-$prompt_colors[up_to_date]} @@ -325,7 +325,7 @@ two_lines_prompt () ## Le prompt le plus magnifique du monde, et c'est le mien ! # Affiche l'user, l'host, le tty et le pwd. Rien que ça... PS1=$AGENTS$MAILSTAT$ERROR$BATTERY$C_$prompt_colors[bar]$_C$STLINUX$HBAR$DATE" -"$C_"30;1"$_C$SHLVL"-"$C_$prompt_color[default]$_C$C_$prompt_colors[user]$_C"%n"$C_$prompt_colors[arob]$_C"@"$C_$prompt_colors[host]$_C"%m"$C_$prompt_colors[display]$_C"$DISPLAY "$CURDIR$CVSTAG$SVNREV$GITBRANCH$HGBRANCH" "$C_$prompt_colors[dies]$_C"%#"$C_$prompt_colors[cmd]$_C" " +"$C_"30;1"$_C$SHLVL"-"$C_$prompt_color[default]$_C$C_$prompt_colors[user]$_C"%n"$C_$prompt_colors[arob]$_C"@"$C_$prompt_colors[host]$_C"%m"$C_$prompt_colors[display]$_C"($DISPLAY) "$CURDIR$CVSTAG$SVNREV$GITBRANCH$HGBRANCH" "$C_$prompt_colors[dies]$_C"%#"$C_$prompt_colors[cmd]$_C" " } |