From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 25 Feb 2014 15:42:09 +0000 (+0100)
Subject: cvsrc: Strip comments and newlines.
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=a54b50fd59f07f9ef5cdcd042135e2b85a059d31;p=config%2Fdotfiles.git

cvsrc: Strip comments and newlines.
---

diff --git a/.gitignore b/.gitignore
index c779065..90c6c6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 # Ignore generated files.
+cvsrc
 gitconfig
 hgrc
diff --git a/cvsrc b/cvsrc.in
similarity index 83%
rename from cvsrc
rename to cvsrc.in
index 8797921..eb71321 100644
--- a/cvsrc
+++ b/cvsrc.in
@@ -1,6 +1,9 @@
 # CVS configuration file.
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# CVS doesn't support comments and newlines in ~/.cvsrc. They must be stripped
+# before using this file.
+
+# Copyright (C) 2011-2014  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/setup.sh b/setup.sh
index 588e81a..181766a 100755
--- a/setup.sh
+++ b/setup.sh
@@ -64,5 +64,8 @@ if installed hg; then
 fi
 
 if installed cvs; then
+    # CVS doesn't support any comments nor empty lines in cvsrc.
+    grep -E -v '^#' cvsrc.in | grep -E -v '^$' >cvsrc
+
     link cvsrc ~/.cvsrc
 fi