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

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index ff01b10bb234e5a2ece104847549010add812f91..2afcaeaf91e0a292e07939641ee9effbba1f96d0 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -27,10 +27,20 @@ if installed git; then
     generate gitconfig .in simple_cpp \
         PWD -- "`pwd`"
 
+    # Older Git versions don't support push.default = simple.
+    if ! git status >/dev/null 2>&1; then
+        echo 'gitconfig: removing push.default = simple'
+        grep_i -v '^[[:space:]]default = simple$' gitconfig
+    fi
     # Older Git versions don't support --patience.
     if ! git diff --patience >/dev/null 2>&1; then
+        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