setup.sh: Detect libcoloredstderr and remove stderr "fix" if present.

diff --git a/setup.sh b/setup.sh
index 6647014475f9c690d0ba0d47671fe28e61654359..2afcaeaf91e0a292e07939641ee9effbba1f96d0 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -37,6 +37,10 @@ if installed git; then
         echo 'gitconfig: removing --patience'
         sed_i 's/--patience//' gitconfig
     fi
         echo 'gitconfig: removing --patience'
         sed_i 's/--patience//' gitconfig
     fi

+    if printf '%s' "$LD_PRELOAD" | grep libcoloredstderr.so >/dev/null; then
+        echo 'gitconfig: removing stderr fix'
+        sed_i '/^\t\(fs\|fg\)  =/ s/2>&1//' gitconfig
+    fi

 
     link gitconfig ~/.gitconfig
 fi
 
     link gitconfig ~/.gitconfig
 fi