setup.sh: Use new generate() argument order.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 2747b9235d4533990ea361ae4a4c8c5d08e99ac2..4b5fc72b8e3b2b05eb1d02c9a9ae90f0f76556d2 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -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,11 +30,10 @@ if installed git; then
         PATIENCE=--patience
     fi
 
-    generate m4 gitconfig \
-        -DGITIGNORE=`pwd`/gitignore \
+    generate gitconfig .m4 m4 \
         -DPATIENCE="$PATIENCE" \
         -DOS=`os` \
-        -DTIG="`pwd`/tig.pl"
+        -DPWD="`pwd`"
     link gitconfig ~/.gitconfig
 fi
 
@@ -40,8 +42,7 @@ if installed tig; then
 fi
 
 if installed hg; then
-    generate m4 hgrc \
-        -DHGIGNORE=`pwd`/hgignore \
+    generate hgrc .m4 m4 \
         -DOS=`os`
     link hgrc ~/.hgrc
 fi