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

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index e2e1edd7ebaefeeb57aa8475b2e74903dc0d54d4..2afcaeaf91e0a292e07939641ee9effbba1f96d0 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -22,18 +22,26 @@ set -e
 
 . ../lib.sh
 
+
 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.
-    PATIENCE=
-    if git diff --patience >/dev/null 2>&1; then
-        PATIENCE=--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
 
-    generate m4 gitconfig \
-        -DGITIGNORE=`pwd`/gitignore \
-        -DPATIENCE="$PATIENCE" \
-        -DOS=`os` \
-        -DTIG="`pwd`/tig.pl"
     link gitconfig ~/.gitconfig
 fi
 
@@ -42,9 +50,6 @@ if installed tig; then
 fi
 
 if installed hg; then
-    generate m4 hgrc \
-        -DHGIGNORE=`pwd`/hgignore \
-        -DOS=`os`
     link hgrc ~/.hgrc
 fi