From 644e31524a6a9a22c671a368aeb3b4eaeb61cf29 Mon Sep 17 00:00:00 2001
From: Prudhvi Krishna <prudhvi953@gmail.com>
Date: Tue, 2 Sep 2014 17:36:53 -0700
Subject: [PATCH] SPARK-3328 fixed make-distribution script --with-tachyon
option.
Directory path for dependencies jar and resources in Tachyon 0.5.0 has been changed.
Author: Prudhvi Krishna <prudhvi953@gmail.com>
Closes #2228 from prudhvije/SPARK-3328/make-dist-fix and squashes the following commits:
d1d2c22 [Prudhvi Krishna] SPARK-3328 fixed make-distribution script --with-tachyon option.
---
make-distribution.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/make-distribution.sh b/make-distribution.sh
index ee13990711..f030d3f430 100755
--- a/make-distribution.sh
+++ b/make-distribution.sh
@@ -219,10 +219,10 @@ if [ "$SPARK_TACHYON" == "true" ]; then
wget "$TACHYON_URL"
tar xf "tachyon-${TACHYON_VERSION}-bin.tar.gz"
- cp "tachyon-${TACHYON_VERSION}/target/tachyon-${TACHYON_VERSION}-jar-with-dependencies.jar" "$DISTDIR/lib"
+ cp "tachyon-${TACHYON_VERSION}/core/target/tachyon-${TACHYON_VERSION}-jar-with-dependencies.jar" "$DISTDIR/lib"
mkdir -p "$DISTDIR/tachyon/src/main/java/tachyon/web"
cp -r "tachyon-${TACHYON_VERSION}"/{bin,conf,libexec} "$DISTDIR/tachyon"
- cp -r "tachyon-${TACHYON_VERSION}"/src/main/java/tachyon/web/resources "$DISTDIR/tachyon/src/main/java/tachyon/web"
+ cp -r "tachyon-${TACHYON_VERSION}"/core/src/main/java/tachyon/web "$DISTDIR/tachyon/src/main/java/tachyon/web"
if [[ `uname -a` == Darwin* ]]; then
# need to run sed differently on osx
--
GitLab