X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=596d4057c44c397b9498423717518f74a18ca43b;hb=cdc2d386805b2120e1e5abc0527a45b1c810ba9c;hp=588e81acb408640bd51074d94c1be204825229a9;hpb=b029ee83b00588cd35c318a6a44cd350bb952190;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 588e81a..596d405 100755
--- a/setup.sh
+++ b/setup.sh
@@ -47,6 +47,8 @@ if installed git; then
         echo 'gitconfig: replacing git log --patch with -p'
         sed_i 's/log --patch/log -p/' gitconfig
     fi
+    # If coloredstderr is used to color stderr then remove the workaround for
+    # missing output to stderr.
     if printf '%s' "$LD_PRELOAD" | grep libcoloredstderr.so >/dev/null; then
         echo 'gitconfig: removing stderr fix'
         sed_i '/^\t\(fs\|fg\)  =/ s/2>&1//' gitconfig
@@ -64,5 +66,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