aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrudhvi Krishna <prudhvi953@gmail.com>2014-09-02 17:36:53 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-09-02 17:36:53 -0700
commit644e31524a6a9a22c671a368aeb3b4eaeb61cf29 (patch)
tree3d25b360dcddfa4d062cd013d9eda73495e81e73
parente2c901b4c72b247bb422dd5acf057bc583e639ab (diff)
downloadspark-644e31524a6a9a22c671a368aeb3b4eaeb61cf29.tar.gz
spark-644e31524a6a9a22c671a368aeb3b4eaeb61cf29.tar.bz2
spark-644e31524a6a9a22c671a368aeb3b4eaeb61cf29.zip
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.
-rwxr-xr-xmake-distribution.sh4
1 files 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