Github user srowen commented on a diff in the pull request:
https://github.com/apache/spark/pull/17452#discussion_r108898852
--- Diff: dev/make-distribution.sh ---
@@ -217,43 +217,43 @@ fi
# Make R package - this is used for both CRAN release and packing R layout
into distribution
if [ "$MAKE_R" == "true" ]; then
echo "Building R source package"
- R_PACKAGE_VERSION=`grep Version $SPARK_HOME/R/pkg/DESCRIPTION | awk
'{print $NF}'`
+ R_PACKAGE_VERSION=`grep Version "$SPARK_HOME/R/pkg/DESCRIPTION" | awk
'{print $NF}'`
pushd "$SPARK_HOME/R" > /dev/null
# Build source package and run full checks
# Do not source the check-cran.sh - it should be run from where it is
for it to set SPARK_HOME
- NO_TESTS=1 "$SPARK_HOME/"R/check-cran.sh
+ NO_TESTS=1 "$SPARK_HOME/R/check-cran.sh"
# Move R source package to match the Spark release version if the
versions are not the same.
# NOTE(shivaram): `mv` throws an error on Linux if source and
destination are same file
if [ "$R_PACKAGE_VERSION" != "$VERSION" ]; then
- mv $SPARK_HOME/R/SparkR_"$R_PACKAGE_VERSION".tar.gz
$SPARK_HOME/R/SparkR_"$VERSION".tar.gz
+ mv "$SPARK_HOME/R/SparkR_$R_PACKAGE_VERSION.tar.gz"
"$SPARK_HOME/R/SparkR_$VERSION.tar.gz"
fi
# Install source package to get it to generate vignettes rds files, etc.
- VERSION=$VERSION "$SPARK_HOME/"R/install-source-package.sh
+ VERSION=$VERSION "$SPARK_HOME/R/install-source-package.sh"
popd > /dev/null
else
echo "Skipping building R source package"
fi
# Copy other things
-mkdir "$DISTDIR"/conf
-cp "$SPARK_HOME"/conf/*.template "$DISTDIR"/conf
+mkdir "$DISTDIR/conf"
+cp "$SPARK_HOME"/conf/*.template "$DISTDIR/conf"
--- End diff --
Sorry, yes that's also correct. But right now this is just one big argument
to cp, not 2 or more. Doesn't it need to be more like `cp
"$SPARK_HOME"/conf/*.template "$DISTDIR/conf"`?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
