[Genabel-commits] r1752 - pkg/GenABEL-general/distrib_scripts

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

Author: lckarssen
Date: 2014-06-20 14:47:19 +0200 (Fri, 20 Jun 2014)
New Revision: 1752

Modified:
   pkg/GenABEL-general/distrib_scripts/makedistrib_MetABEL.sh
Log:
Updated the MetABEL distrib script.
- Corrected order of build -> check to check -> build
- Introduced the $RCMD variable


Modified: pkg/GenABEL-general/distrib_scripts/makedistrib_MetABEL.sh
===================================================================
--- pkg/GenABEL-general/distrib_scripts/makedistrib_MetABEL.sh	2014-06-10 12:49:25 UTC (rev 1751)
+++ pkg/GenABEL-general/distrib_scripts/makedistrib_MetABEL.sh	2014-06-20 12:47:19 UTC (rev 1752)
@@ -13,6 +13,7 @@
 
 PKG=MetABEL
 CRAN_repo='"http://cran-mirror.cs.uu.nl"'
+RCMD="R --vanilla CMD"
 
 # Exit on errors
 set -e
@@ -88,16 +89,9 @@
 errwarn=0
 echo
 echo "--------------------------------------------------"
-echo "Building the package..."
+echo "Running normal R checks..."
 echo "--------------------------------------------------"
-R --vanilla CMD build $PKG
-PKGFILE=${PKG}_${DESCVERSION}.tar.gz
-
-echo
-echo "--------------------------------------------------"
-echo "Running normal R check on $PKGFILEs..."
-echo "--------------------------------------------------"
-R --vanilla CMD check $PKGFILE
+$RCMD check $PKG
 if grep -qE "NOTE|WARNING|ERROR" $PKG.Rcheck/00check.log; then
     errwarn=1
 fi
@@ -105,9 +99,9 @@
 if [ $CRANCHECK == true ]; then
     echo
     echo "--------------------------------------------------"
-    echo "Check $PKGFILE with --as-cran..."
+    echo "Check with --as-cran..."
     echo "--------------------------------------------------"
-    R --vanilla CMD check --as-cran $PKGFILE
+    $RCMD check --as-cran $PKG
     if sed -e 's/feasibility ... WARNING/feasibility ... WRNNG/' \
         -e 's/^WARNING/WRNNG/' $PKG.Rcheck/00check.log | \
         grep -qE "NOTE|WARNING|ERROR"; then
@@ -115,7 +109,12 @@
     fi
 fi
 
-## Report whether warnings, errors, notes where found
+echo
+echo "--------------------------------------------------"
+echo "Building the package for distribution..."
+echo "--------------------------------------------------"
+$RCMD build $PKG
+
 if [ $errwarn -eq 1 ]; then
     echo
     echo "NOTEs, WARNINGs or ERRORs found!" 1>&2