From 3ff105f87db217c0c0af0f176626a416b2669740 Mon Sep 17 00:00:00 2001
From: Matei Zaharia <matei@eecs.berkeley.edu>
Date: Tue, 27 Aug 2013 15:46:23 -0700
Subject: Find assembly correctly in pyspark

---
 pyspark | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pyspark')

diff --git a/pyspark b/pyspark
index 155ccd4fdf..aedc51e048 100755
--- a/pyspark
+++ b/pyspark
@@ -23,10 +23,12 @@ FWDIR="$(cd `dirname $0`; pwd)"
 # Export this as SPARK_HOME
 export SPARK_HOME="$FWDIR"
 
+SCALA_VERSION=2.9.3
+
 # Exit if the user hasn't compiled Spark
 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
+  ls "$FWDIR"/assembly/target/scala-$SCALA_VERSION/spark-assembly*hadoop*.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
-- 
cgit v1.2.3