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

diff --git a/setup.sh b/setup.sh
index 181766a..0f93a8c 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
 
@@ -37,17 +37,16 @@ if installed git; 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 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
@@ -56,7 +55,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