X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=ff01b10bb234e5a2ece104847549010add812f91;hb=c3582889fd9132a91a74d483dd165ed65bad47c5;hp=4b5fc72b8e3b2b05eb1d02c9a9ae90f0f76556d2;hpb=f72da7852fe0e689875030ec2972f3198be91458;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 4b5fc72..ff01b10 100755
--- a/setup.sh
+++ b/setup.sh
@@ -24,16 +24,14 @@ set -e
 
 
 if installed git; then
+    generate gitconfig .in simple_cpp \
+        PWD -- "`pwd`"
+
     # Older Git versions don't support --patience.
-    PATIENCE=
-    if git diff --patience >/dev/null 2>&1; then
-        PATIENCE=--patience
+    if ! git diff --patience >/dev/null 2>&1; then
+        sed_i 's/--patience//' gitconfig
     fi
 
-    generate gitconfig .m4 m4 \
-        -DPATIENCE="$PATIENCE" \
-        -DOS=`os` \
-        -DPWD="`pwd`"
     link gitconfig ~/.gitconfig
 fi
 
@@ -42,8 +40,6 @@ if installed tig; then
 fi
 
 if installed hg; then
-    generate hgrc .m4 m4 \
-        -DOS=`os`
     link hgrc ~/.hgrc
 fi