X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=06585379f22d3460fc2d227fe736a735f66dd6eb;hb=530e9d8086345ec7013902f97a473d3eca52a2fb;hp=0ef9e6af12dcdc7067a3195ef52abd6296a6ba98;hpb=2eef5463417d581034bfbacb016114d0a5be3434;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 0ef9e6a..0658537 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,8 +18,11 @@
 # 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=
@@ -27,10 +30,8 @@ if installed git; then
         PATIENCE=--patience
     fi
 
-    generate m4 gitconfig \
-        -DGITIGNORE=`pwd`/gitignore \
-        -DPATIENCE="$PATIENCE" \
-        -DOS=`os`
+    generate gitconfig .in simple_cpp \
+        PATIENCE PWD -- "$PATIENCE" "`pwd`"
     link gitconfig ~/.gitconfig
 fi
 
@@ -39,9 +40,6 @@ if installed tig; then
 fi
 
 if installed hg; then
-    generate m4 hgrc \
-        -DHGIGNORE=`pwd`/hgignore \
-        -DOS=`os`
     link hgrc ~/.hgrc
 fi