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

diff --git a/setup.sh b/setup.sh
index abdbc65..bab4ce2 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,11 +2,43 @@
 
 # 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
 
-generate m4 gitconfig -DGITIGNORE=`pwd`/gitignore -DOS=`os`
-link gitconfig ~/.gitconfig
+
+if installed git; then
+    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
 
 if installed tig; then
     link tigrc ~/.tigrc
@@ -14,5 +46,8 @@ fi
 
 if installed hg; then
     link hgrc ~/.hgrc
-    link hgignore ~/.hgignore
+fi
+
+if installed cvs; then
+    link cvsrc ~/.cvsrc
 fi