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

diff --git a/setup.sh b/setup.sh
index bedc5bb..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,10 +18,21 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+set -e
+
 . ../lib.sh
 
 if installed git; then
-    generate m4 gitconfig -DGITIGNORE=`pwd`/gitignore -DOS=`os`
+    # Older Git versions don't support --patience.
+    PATIENCE=
+    if git diff --patience >/dev/null 2>&1; then
+        PATIENCE=--patience
+    fi
+
+    generate m4 gitconfig \
+        -DPATIENCE="$PATIENCE" \
+        -DOS=`os` \
+        -DPWD="`pwd`"
     link gitconfig ~/.gitconfig
 fi
 
@@ -30,7 +41,8 @@ if installed tig; then
 fi
 
 if installed hg; then
-    generate m4 hgrc -DHGIGNORE=`pwd`/hgignore -DOS=`os`
+    generate m4 hgrc \
+        -DOS=`os`
     link hgrc ~/.hgrc
 fi