setup.sh: No need to convert hgrc with m4 anymore.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 0ef9e6af12dcdc7067a3195ef52abd6296a6ba98..703f27d29ece80f6ce8e3e79d06fdffaac9eaad2 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,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,10 @@ if installed git; then
         PATIENCE=--patience
     fi
 
-    generate m4 gitconfig \
-        -DGITIGNORE=`pwd`/gitignore \
+    generate gitconfig .m4 m4 \
         -DPATIENCE="$PATIENCE" \
-        -DOS=`os`
+        -DOS=`os` \
+        -DPWD="`pwd`"
     link gitconfig ~/.gitconfig
 fi
 
@@ -39,9 +42,6 @@ if installed tig; then
 fi
 
 if installed hg; then
-    generate m4 hgrc \
-        -DHGIGNORE=`pwd`/hgignore \
-        -DOS=`os`
     link hgrc ~/.hgrc
 fi