X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=c61c00dcdfbc8d97f4fc16c08a860bc6a60ff532;hb=469dfb554f9ee2f50c6df74372342abe8a229c0c;hp=d59568ff712b6b7db01e0a1df3c4eb037cc5349b;hpb=3d813d58d987714c1be95a7f963df9ba2453bbe7;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index d59568f..c61c00d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,7 +2,7 @@
 
 # Setup script for VCS configuration files.
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# Copyright (C) 2011-2013  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,12 +18,21 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+set -e
+
 . ../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
+    fi
+
     generate m4 gitconfig \
-        -DGITIGNORE=`pwd`/gitignore \
-        -DOS=`os`
+        -DPATIENCE="$PATIENCE" \
+        -DOS=`os` \
+        -DPWD="`pwd`"
     link gitconfig ~/.gitconfig
 fi
 
@@ -33,7 +42,6 @@ fi
 
 if installed hg; then
     generate m4 hgrc \
-        -DHGIGNORE=`pwd`/hgignore \
         -DOS=`os`
     link hgrc ~/.hgrc
 fi