From 444fb7451cdde5b2de475b4a519114835c18e786 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Fri, 8 Jun 2012 17:20:32 +0200 Subject: [Helpers] cleanup --- net:foret/Prompts.zsh | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'net:foret') diff --git a/net:foret/Prompts.zsh b/net:foret/Prompts.zsh index f9558af..b0d331e 100644 --- a/net:foret/Prompts.zsh +++ b/net:foret/Prompts.zsh @@ -12,41 +12,41 @@ _prompt_colors[target]="1;31" __static_dynamic () { - [ $(( ${STATIC:-$(( 1 ^ ${DYNAMIC:-0} ))} + ${DYNAMIC:-$(( 1 ^ ${STATIC:-0} ))} )) -lt 2 ] && \ - case "${STATIC:-$(( 1 ^ ${DYNAMIC:-0} ))}${DYNAMIC:-$((1 ^ ${STATIC:-0}))}" in - "10") - echo -n $C_ - export | grep -q '^DYNAMIC=' && echo -n "1;" - echo -n $_make_colors[static]$_C"static" ;; - "01") - echo -n $C_ - export | grep -q '^STATIC=' && echo -n "1;" - echo -n $_make_colors[dynamic]$_C"dynamic" ;; - esac + [ $(( ${STATIC:-$(( 1 ^ ${DYNAMIC:-0} ))} + ${DYNAMIC:-$(( 1 ^ ${STATIC:-0} ))} )) -lt 2 ] && \ + case "${STATIC:-$(( 1 ^ ${DYNAMIC:-0} ))}${DYNAMIC:-$((1 ^ ${STATIC:-0}))}" in + "10") + echo -n $C_ + export | grep -q '^DYNAMIC=' && echo -n "1;" + echo -n $_make_colors[static]$_C"static" ;; + "01") + echo -n $C_ + export | grep -q '^STATIC=' && echo -n "1;" + echo -n $_make_colors[dynamic]$_C"dynamic" ;; + esac } __compilation_target () { - [ -n "$TARGET" ] || exit - echo -n $C_ - export | grep -q '^TARGET=' && echo -n "1;" - echo -n $_make_colors[target]$_C$TARGET + [ -n "$TARGET" ] || exit + echo -n $C_ + export | grep -q '^TARGET=' && echo -n "1;" + echo -n $_make_colors[target]$_C$TARGET } __verbose_compilation () { - [ -n "$V" -a "$V" -gt 0 ] || exit - echo -n $C_ - export | grep -q '^V=' && echo -n "1;" - echo -n $_make_colors[verbose]$_C$(for i in {1..$V} ; echo -n -n "V") + [ -n "$V" -a "$V" -gt 0 ] || exit + echo -n $C_ + export | grep -q '^V=' && echo -n "1;" + echo -n $_make_colors[verbose]$_C$(for i in {1..$V} ; echo -n -n "V") } __nproc_compilation () { - [ -n "$NPROC" -a "$NPROC" -gt 0 ] || exit - echo -n $C_ - export | grep -q '^NPROC=' && echo -n "1;" - echo -n $_make_colors[nproc]$_C$(for i in {1..$NPROC} ; echo -n -n "|") + [ -n "$NPROC" -a "$NPROC" -gt 0 ] || ( unset NPROC ; exit 0 ) + echo -n $C_ + export | grep -q '^NPROC=' && echo -n "1;" + echo -n $_make_colors[nproc]$_C$(for i in {1..$NPROC} ; echo -n -n "|") } __makeflags () { -- cgit v1.2.3