X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=0f93a8c9864eb33b4849d8d032503d1a1dd36874;hb=1ac8cbd79e9fd2af79c76ae0bfc6128ae1754759;hp=06585379f22d3460fc2d227fe736a735f66dd6eb;hpb=530e9d8086345ec7013902f97a473d3eca52a2fb;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 0658537..0f93a8c 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,25 +18,48 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
 . ../lib.sh
 
 
 if installed git; then
-    # Older Git versions don't support --patience.
-    PATIENCE=
-    if git diff --patience >/dev/null 2>&1; then
-        PATIENCE=--patience
+    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
+    # Even older Git versions don't support color.function.
+    if ! git status >/dev/null 2>&1; then
+        echo 'gitconfig: removing color.function'
+        sed_i 's/^[[:space:]]*function = .*//' gitconfig
+    fi
+    # Even older Git versions don't support git log --patch but only -p.
+    if ! git log --patch >/dev/null 2>&1; then
+        echo 'gitconfig: replacing git log --patch with -p'
+        sed_i 's/log --patch/log -p/' gitconfig
+    fi
+
+    # If coloredstderr is used to color stderr then remove the workaround for
+    # missing output to stderr.
+    if test -n "${LD_PRELOAD:+set}" \
+            && 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 gitconfig .in simple_cpp \
-        PATIENCE PWD -- "$PATIENCE" "`pwd`"
     link gitconfig ~/.gitconfig
 fi
 
 if installed tig; then
-    link tigrc ~/.tigrc
+    if tig --version | grep -F 'tig version 1.' >/dev/null; then
+        link tigrc.old ~/.tigrc
+    else
+        link tigrc ~/.tigrc
+    fi
 fi
 
 if installed hg; then
@@ -44,5 +67,8 @@ if installed hg; then
 fi
 
 if installed cvs; then
+    # CVS doesn't support any comments nor empty lines in cvsrc.
+    grep -E -v '^#' cvsrc.in | grep -E -v '^$' >cvsrc
+
     link cvsrc ~/.cvsrc
 fi