diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-08-22 23:02:09 -0700 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-08-29 21:19:06 -0700 |
commit | ab0e625d9e0abd62a20754125952e3a00f2c275a (patch) | |
tree | 6a49b937b1241f0b021c657cd1b0a5efa9b9635c /pyspark | |
parent | 53cd50c0699efc8733518658100c62426b425de2 (diff) | |
download | spark-ab0e625d9e0abd62a20754125952e3a00f2c275a.tar.gz spark-ab0e625d9e0abd62a20754125952e3a00f2c275a.tar.bz2 spark-ab0e625d9e0abd62a20754125952e3a00f2c275a.zip |
Fix PySpark for assembly run and include it in dist
Diffstat (limited to 'pyspark')
-rwxr-xr-x | pyspark | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -24,10 +24,14 @@ FWDIR="$(cd `dirname $0`; pwd)" export SPARK_HOME="$FWDIR" # Exit if the user hasn't compiled Spark -if [ ! -e "$SPARK_HOME/repl/target" ]; then - echo "Failed to find Spark classes in $SPARK_HOME/repl/target" >&2 - echo "You need to compile Spark before running this program" >&2 - exit 1 +if [ ! -f "$FWDIR/RELEASE" ]; then + # Exit if the user hasn't compiled Spark + ls "$FWDIR"/assembly/target/scala-$SCALA_VERSION/spark-assembly*.jar >& /dev/null + if [[ $? != 0 ]]; then + echo "Failed to find Spark assembly in $FWDIR/assembly/target" >&2 + echo "You need to compile Spark before running this program" >&2 + exit 1 + fi fi # Load environment variables from conf/spark-env.sh, if it exists |