cvsrc: Strip comments and newlines.

diff --git a/.gitignore b/.gitignore
index c779065e3d2d46be716d045cf651f03c9cbf48c8..90c6c6a146c6ca08e8f64a0b9e00d1d7148917a4 100644 (file)
--- 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 879792116bcc820cfe4a86b420e71261d2c5fb70..eb7132114a49029694f8ac6cef224cee319c1718 100644 (file)
--- 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 588e81acb408640bd51074d94c1be204825229a9..181766a860e235400a762c9dd27970f07b2610a8 100755 (executable)
--- 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