X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=3f49ad598c597b31aca0bc8837c919cc2ec6dd86;hb=e610385bb4f75ea3579385967eb038a8784bff12;hp=6647014475f9c690d0ba0d47671fe28e61654359;hpb=2dc2008b7e050faa98d389bb7f5879b2e5e6e85b;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 6647014..3f49ad5 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
 . ../lib.sh
 
@@ -32,11 +32,27 @@ if installed git; 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
     # 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
+    # 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 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
@@ -50,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