[Genabel-commits] r1580 - pkg/GenABEL-general/scripts

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2014-02-03 14:51:44 +0100 (Mon, 03 Feb 2014)
New Revision: 1580

Modified:
   pkg/GenABEL-general/scripts/makedistrib_MetABEL.sh
Log:
Update to the makedistrib_MetABEL.sh script: Since R CMD check --as-cran also checks the current version number this results in a WARNING if you're simply running the script without having updated the version number. Since I use this check also in Jenkins, Jenkins always fails. With this version of the script, that WARNING is suppressed.


Modified: pkg/GenABEL-general/scripts/makedistrib_MetABEL.sh
===================================================================
--- pkg/GenABEL-general/scripts/makedistrib_MetABEL.sh	2014-01-30 09:32:39 UTC (rev 1579)
+++ pkg/GenABEL-general/scripts/makedistrib_MetABEL.sh	2014-02-03 13:51:44 UTC (rev 1580)
@@ -67,7 +67,9 @@
 echo "Check with --as-cran..."
 echo "--------------------------------------------------"
 R CMD check --as-cran $PKG
-if grep -qE "NOTE|WARNING|ERROR" $PKG.Rcheck/00check.log; then
+if sed -e 's/feasibility ... WARNING/feasibility ... WRNNG/' \
+    -e 's/^WARNING/WRNNG/' $PKG.Rcheck/00check.log | \
+    grep -qE "NOTE|WARNING|ERROR"; then
     errwarn=1
 fi