setup.sh: Use simple_cpp() instead of m4 to create gitconfig.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index d59568ff712b6b7db01e0a1df3c4eb037cc5349b..06585379f22d3460fc2d227fe736a735f66dd6eb 100755 (executable)
--- 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,20 @@
 # 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 gitconfig .in simple_cpp \
+        PATIENCE PWD -- "$PATIENCE" "`pwd`"
     link gitconfig ~/.gitconfig
 fi
 
@@ -32,9 +40,6 @@ if installed tig; then
 fi
 
 if installed hg; then
-    generate m4 hgrc \
-        -DHGIGNORE=`pwd`/hgignore \
-        -DOS=`os`
     link hgrc ~/.hgrc
 fi