X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=bf22f99166748ec23867772fd76e5f1d145c67c0;hb=e64f5aca9dff4e4a0cd8ced5d8131a06addb85ab;hp=2afcaeaf91e0a292e07939641ee9effbba1f96d0;hpb=ccfa4fe2a1c6e75a3e467aa2f03ea720b16c8fe8;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 2afcaea..bf22f99 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,26 +18,34 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
 . ../lib.sh
 
 
 if installed git; then
-    generate gitconfig .in simple_cpp \
-        PWD -- "`pwd`"
+    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
+    # 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 printf '%s' "$LD_PRELOAD" | grep libcoloredstderr.so >/dev/null; then
+
+    # 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
@@ -46,7 +54,11 @@ if installed git; then
 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
@@ -54,5 +66,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