diff options
| author | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-05-23 12:28:16 -0700 |
|---|---|---|
| committer | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-05-23 12:28:16 -0700 |
| commit | b231baa24857ea83c8062dd4e033db4e35bf457d (patch) | |
| tree | 6d3496c02669299686dc41654312cf132a747a93 /make-distribution.sh | |
| parent | 2b7e63585d61be2dab78b70af3867cda3983d5b1 (diff) | |
| download | spark-b231baa24857ea83c8062dd4e033db4e35bf457d.tar.gz spark-b231baa24857ea83c8062dd4e033db4e35bf457d.tar.bz2 spark-b231baa24857ea83c8062dd4e033db4e35bf457d.zip | |
[HOTFIX] Copy SparkR lib if it exists in make-distribution
This is to fix an issue reported in #6373 where the `cp` would fail if `-Psparkr` was not used in the build
cc dragos pwendell
Author: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
Closes #6379 from shivaram/make-distribution-hotfix and squashes the following commits:
08eb7e4 [Shivaram Venkataraman] Copy SparkR lib if it exists in make-distribution
Diffstat (limited to 'make-distribution.sh')
| -rwxr-xr-x | make-distribution.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/make-distribution.sh b/make-distribution.sh index 78827341b9..a2b0c431fb 100755 --- a/make-distribution.sh +++ b/make-distribution.sh @@ -229,10 +229,13 @@ cp "$SPARK_HOME"/conf/*.template "$DISTDIR"/conf cp "$SPARK_HOME/README.md" "$DISTDIR" cp -r "$SPARK_HOME/bin" "$DISTDIR" cp -r "$SPARK_HOME/python" "$DISTDIR" -mkdir -p "$DISTDIR"/R/lib -cp -r "$SPARK_HOME/R/lib/SparkR" "$DISTDIR"/R/lib cp -r "$SPARK_HOME/sbin" "$DISTDIR" cp -r "$SPARK_HOME/ec2" "$DISTDIR" +# Copy SparkR if it exists +if [ -d "$SPARK_HOME"/R/lib/SparkR ]; then + mkdir -p "$DISTDIR"/R/lib + cp -r "$SPARK_HOME/R/lib/SparkR" "$DISTDIR"/R/lib +fi # Download and copy in tachyon, if requested if [ "$SPARK_TACHYON" == "true" ]; then |