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

diff --git a/setup.sh b/setup.sh
index abdbc65..703f27d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,11 +2,40 @@
 
 # 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
+    # Older Git versions don't support --patience.
+    PATIENCE=
+    if git diff --patience >/dev/null 2>&1; then
+        PATIENCE=--patience
+    fi
+
+    generate gitconfig .m4 m4 \
+        -DPATIENCE="$PATIENCE" \
+        -DOS=`os` \
+        -DPWD="`pwd`"
+    link gitconfig ~/.gitconfig
+fi
 
 if installed tig; then
     link tigrc ~/.tigrc
@@ -14,5 +43,8 @@ fi
 
 if installed hg; then
     link hgrc ~/.hgrc
-    link hgignore ~/.hgignore
+fi
+
+if installed cvs; then
+    link cvsrc ~/.cvsrc
 fi