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

diff --git a/setup.sh b/setup.sh
index 94f4535..c61c00d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,11 +2,37 @@
 
 # Setup script for VCS configuration files.
 
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# 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
 
@@ -15,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