From a54b50fd59f07f9ef5cdcd042135e2b85a059d31 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Tue, 25 Feb 2014 16:42:09 +0100 Subject: [PATCH] cvsrc: Strip comments and newlines. --- .gitignore | 1 + cvsrc => cvsrc.in | 5 ++++- setup.sh | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) rename cvsrc => cvsrc.in (83%) 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 -- 2.43.2