X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=bab4ce22762cde37db3623fcb63ce4b9277f1eac;hb=917248b29e9f635f27a533034f655cc110e2cca7;hp=94f4535370b3deabe3b5a525048d0feba90ba9c7;hpb=c054c2fbc7873aa7255c85422ba5abce825c4bbb;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 94f4535..bab4ce2 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,11 +2,41 @@
 
 # Setup script for VCS configuration files.
 
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# 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`
+    generate gitconfig .in simple_cpp \
+        PWD -- "`pwd`"
+
+    # Older Git versions don't support push.default = simple.
+    if ! git status >/dev/null 2>&1; then
+        echo 'gitconfig: removing push.default = simple'
+        grep_i -v '^[[:space:]]default = simple$' gitconfig
+    fi
+    # Older Git versions don't support --patience.
+    if ! git diff --patience >/dev/null 2>&1; then
+        sed_i 's/--patience//' gitconfig
+    fi
+
     link gitconfig ~/.gitconfig
 fi
 
@@ -15,7 +45,6 @@ if installed tig; then
 fi
 
 if installed hg; then
-    generate m4 hgrc -DHGIGNORE=`pwd`/hgignore -DOS=`os`
     link hgrc ~/.hgrc
 fi