diff options
author | Mridul Muralidharan <mridul@gmail.com> | 2013-04-30 16:15:56 +0530 |
---|---|---|
committer | Mridul Muralidharan <mridul@gmail.com> | 2013-04-30 16:15:56 +0530 |
commit | e46d547ccd43c0fb3a79a30a7c43a78afba6f93f (patch) | |
tree | 2be690103accb3aa8615fe5095391e03f705820c /run | |
parent | 430c531464a5372237c97394f8f4b6ec344394c0 (diff) | |
download | spark-e46d547ccd43c0fb3a79a30a7c43a78afba6f93f.tar.gz spark-e46d547ccd43c0fb3a79a30a7c43a78afba6f93f.tar.bz2 spark-e46d547ccd43c0fb3a79a30a7c43a78afba6f93f.zip |
Fix issues reported by Reynold
Diffstat (limited to 'run')
-rwxr-xr-x | run | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -95,6 +95,7 @@ export JAVA_OPTS CORE_DIR="$FWDIR/core" REPL_DIR="$FWDIR/repl" +REPL_BIN_DIR="$FWDIR/repl-bin" EXAMPLES_DIR="$FWDIR/examples" BAGEL_DIR="$FWDIR/bagel" STREAMING_DIR="$FWDIR/streaming" @@ -125,8 +126,8 @@ if [ -e "$FWDIR/lib_managed" ]; then CLASSPATH+=":$FWDIR/lib_managed/bundles/*" fi CLASSPATH+=":$REPL_DIR/lib/*" -if [ -e repl-bin/target ]; then - for jar in `find "repl-bin/target" -name 'spark-repl-*-shaded-hadoop*.jar'`; do +if [ -e $REPL_BIN_DIR/target ]; then + for jar in `find "$REPL_BIN_DIR/target" -name 'spark-repl-*-shaded-hadoop*.jar'`; do CLASSPATH+=":$jar" done fi @@ -134,7 +135,6 @@ CLASSPATH+=":$BAGEL_DIR/target/scala-$SCALA_VERSION/classes" for jar in `find $PYSPARK_DIR/lib -name '*jar'`; do CLASSPATH+=":$jar" done -export CLASSPATH # Needed for spark-shell # Figure out the JAR file that our examples were packaged into. This includes a bit of a hack # to avoid the -sources and -doc packages that are built by publish-local. @@ -163,4 +163,5 @@ else EXTRA_ARGS="$JAVA_OPTS" fi +export CLASSPATH # Needed for spark-shell exec "$RUNNER" -cp "$CLASSPATH" $EXTRA_ARGS "$@" |