X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=6647014475f9c690d0ba0d47671fe28e61654359;hb=2dc2008b7e050faa98d389bb7f5879b2e5e6e85b;hp=09c2fa6fcc88bd13af03ba1d26479dba2af78ac2;hpb=e7f2c71f7ef491d949700d74a79c7876edd7eece;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 09c2fa6..6647014 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,11 +2,42 @@
 
 # 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
+        echo 'gitconfig: removing --patience'
+        sed_i 's/--patience//' gitconfig
+    fi
+
     link gitconfig ~/.gitconfig
 fi
 
@@ -15,6 +46,9 @@ if installed tig; then
 fi
 
 if installed hg; then
-    generate m4 hgrc -DHGIGNORE=`pwd`/hgignore -DOS=`os`
     link hgrc ~/.hgrc
 fi
+
+if installed cvs; then
+    link cvsrc ~/.cvsrc
+fi