aboutsummaryrefslogtreecommitdiff
path: root/bin/compute-classpath.sh
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2014-04-23 10:19:32 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-04-23 10:19:32 -0700
commitcd4ed293262e2349794c13467d1737974385c019 (patch)
treec6cc98ccfaab8c59a41dd4771e97e9f872ec1727 /bin/compute-classpath.sh
parent39f85e0322cfecefbc30e7d5a30356cfab1e9640 (diff)
downloadspark-cd4ed293262e2349794c13467d1737974385c019.tar.gz
spark-cd4ed293262e2349794c13467d1737974385c019.tar.bz2
spark-cd4ed293262e2349794c13467d1737974385c019.zip
SPARK-1119 and other build improvements
1. Makes assembly and examples jar naming consistent in maven/sbt. 2. Updates make-distribution.sh to use Maven and fixes some bugs. 3. Updates the create-release script to call make-distribution script. Author: Patrick Wendell <pwendell@gmail.com> Closes #502 from pwendell/make-distribution and squashes the following commits: 1a97f0d [Patrick Wendell] SPARK-1119 and other build improvements
Diffstat (limited to 'bin/compute-classpath.sh')
-rwxr-xr-xbin/compute-classpath.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh
index 2a2bb376fd..3a59f599fd 100755
--- a/bin/compute-classpath.sh
+++ b/bin/compute-classpath.sh
@@ -50,9 +50,9 @@ if [ -f "$ASSEMBLY_DIR"/spark-assembly*hadoop*-deps.jar ]; then
else
# Else use spark-assembly jar from either RELEASE or assembly directory
if [ -f "$FWDIR/RELEASE" ]; then
- ASSEMBLY_JAR=`ls "$FWDIR"/jars/spark*-assembly*.jar`
+ ASSEMBLY_JAR=`ls "$FWDIR"/lib/spark-assembly*hadoop*.jar`
else
- ASSEMBLY_JAR=`ls "$ASSEMBLY_DIR"/spark*-assembly*hadoop*.jar`
+ ASSEMBLY_JAR=`ls "$ASSEMBLY_DIR"/spark-assembly*hadoop*.jar`
fi
CLASSPATH="$CLASSPATH:$ASSEMBLY_JAR"
fi