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

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

Author: lckarssen
Date: 2015-05-08 12:06:01 +0200 (Fri, 08 May 2015)
New Revision: 1964

Modified:
   pkg/GenABEL-general/distrib_scripts/distrib_support_functions.sh
Log:
Some variables in the support functions of the make_distrib scripts weren't enclosed in {} yet.

This shouldn't change the actual output but may guard against future mistakes.


Modified: pkg/GenABEL-general/distrib_scripts/distrib_support_functions.sh
===================================================================
--- pkg/GenABEL-general/distrib_scripts/distrib_support_functions.sh	2015-05-02 17:08:48 UTC (rev 1963)
+++ pkg/GenABEL-general/distrib_scripts/distrib_support_functions.sh	2015-05-08 10:06:01 UTC (rev 1964)
@@ -21,7 +21,7 @@
     # In order not to mess with the current user's R library directory we
     # set one in /tmp. Most Linux distributions will remove the
     # directories in /tmp on reboot or after several days.
-    export R_LIBS_USER=/tmp/Rlibs-$PKG-build
+    export R_LIBS_USER=/tmp/Rlibs-${PKG}-build
     mkdir -p ${R_LIBS_USER}
 
     echo
@@ -30,7 +30,7 @@
         "into the directory ${R_LIBS_USER}"
     echo "--------------------------------------------------"
 
-    deps=$($scriptdir/getdeps.awk $PKG/DESCRIPTION)
+    deps=$(${scriptdir}/getdeps.awk ${PKG}/DESCRIPTION)
 
     ${R} --vanilla --no-save --slave <<EOF
 deplist=c($deps)
@@ -51,8 +51,8 @@
     echo "--------------------------------------------------"
     echo "Running normal R checks on package directory..."
     echo "--------------------------------------------------"
-    $RCMD check $PKG
-    if grep -qE "NOTE|WARNING|ERROR" $PKG.Rcheck/00check.log; then
+    ${RCMD} check ${PKG}
+    if grep -qE "NOTE|WARNING|ERROR" ${PKG}.Rcheck/00check.log; then
         echo
         echo "NOTEs, WARNINGs or ERRORs found!" 1>&2
         echo "Please fix!" 1>&2
@@ -62,9 +62,9 @@
     echo "--------------------------------------------------"
     echo "Building the package for distribution..."
     echo "--------------------------------------------------"
-    $RCMD build $PKG
+    ${RCMD} build ${PKG}
 
-    if [ $CRANCHECK == true ]; then
+    if [ ${CRANCHECK} == true ]; then
         echo
         echo "--------------------------------------------------"
         echo "Check package tar-ball with --as-cran..."
@@ -73,13 +73,13 @@
 
         ${R} CMD check --as-cran ${PKG}_${PKG_VERSION}.tar.gz
         if sed -e 's/feasibility ... WARNING/feasibility ... WRNNG/' \
-            -e 's/^WARNING/WRNNG/' $PKG.Rcheck/00check.log | \
+            -e 's/^WARNING/WRNNG/' ${PKG}.Rcheck/00check.log | \
             grep -qE "NOTE|WARNING|ERROR"; then
             errwarn=1
         fi
 
         errwarn=0
-        if [ $errwarn -eq 1 ]; then
+        if [ ${errwarn} -eq 1 ]; then
             echo
             echo "NOTEs, WARNINGs or ERRORs found!" 1>&2
             echo "Please fix before uploading to CRAN" 1>&2