Skip to content

Commit b231baa

Browse files
committed
[HOTFIX] Copy SparkR lib if it exists in make-distribution
This is to fix an issue reported in apache#6373 where the `cp` would fail if `-Psparkr` was not used in the build cc dragos pwendell Author: Shivaram Venkataraman <[email protected]> Closes apache#6379 from shivaram/make-distribution-hotfix and squashes the following commits: 08eb7e4 [Shivaram Venkataraman] Copy SparkR lib if it exists in make-distribution
1 parent 2b7e635 commit b231baa

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

make-distribution.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,13 @@ cp "$SPARK_HOME"/conf/*.template "$DISTDIR"/conf
229229
cp "$SPARK_HOME/README.md" "$DISTDIR"
230230
cp -r "$SPARK_HOME/bin" "$DISTDIR"
231231
cp -r "$SPARK_HOME/python" "$DISTDIR"
232-
mkdir -p "$DISTDIR"/R/lib
233-
cp -r "$SPARK_HOME/R/lib/SparkR" "$DISTDIR"/R/lib
234232
cp -r "$SPARK_HOME/sbin" "$DISTDIR"
235233
cp -r "$SPARK_HOME/ec2" "$DISTDIR"
234+
# Copy SparkR if it exists
235+
if [ -d "$SPARK_HOME"/R/lib/SparkR ]; then
236+
mkdir -p "$DISTDIR"/R/lib
237+
cp -r "$SPARK_HOME/R/lib/SparkR" "$DISTDIR"/R/lib
238+
fi
236239

237240
# Download and copy in tachyon, if requested
238241
if [ "$SPARK_TACHYON" == "true" ]; then

0 commit comments

Comments
 (0)