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

diff --git a/setup.sh b/setup.sh
index 588e81a..3064ade 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
 . ../lib.sh
 
@@ -47,7 +47,10 @@ if installed git; then
         echo 'gitconfig: replacing git log --patch with -p'
         sed_i 's/log --patch/log -p/' gitconfig
     fi
-    if printf '%s' "$LD_PRELOAD" | grep libcoloredstderr.so >/dev/null; then
+    # If coloredstderr is used to color stderr then remove the workaround for
+    # missing output to stderr.
+    if test -n "${LD_PRELOAD:+set}" \
+            && printf '%s' "$LD_PRELOAD" | grep libcoloredstderr.so >/dev/null; then
         echo 'gitconfig: removing stderr fix'
         sed_i '/^\t\(fs\|fg\)  =/ s/2>&1//' gitconfig
     fi
@@ -64,5 +67,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