diff options
| author | raschild <raschild@users.noreply.github.com> | 2015-04-09 07:04:18 -0400 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-04-09 07:04:45 -0400 |
| commit | 53f6bb1dfec74cbe8be9ae6a670d82eb6759cc8c (patch) | |
| tree | 7e992a64b530e6e1a235c53e7c3461335316b64b /bin | |
| parent | b9c51c04932efeeda790752276078314db440634 (diff) | |
| download | spark-53f6bb1dfec74cbe8be9ae6a670d82eb6759cc8c.tar.gz spark-53f6bb1dfec74cbe8be9ae6a670d82eb6759cc8c.tar.bz2 spark-53f6bb1dfec74cbe8be9ae6a670d82eb6759cc8c.zip | |
SPARK-4924 addendum. Minor assembly directory fix in load-spark-env-sh
Set the current dir path $FWDIR and same at $ASSEMBLY_DIR1, $ASSEMBLY_DIR2
otherwise $SPARK_HOME cannot be visible from spark-env.sh -- no SPARK_HOME variable is assigned there.
I am using the Spark-1.3.0 source code package and I come across with this when trying to start the master: sbin/start-master.sh
Author: raschild <raschild@users.noreply.github.com>
Closes #5261 from raschild/patch-1 and squashes the following commits:
b9babcd [raschild] Update load-spark-env.sh
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/load-spark-env.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/load-spark-env.sh b/bin/load-spark-env.sh index 2d7070c25d..95779e9ddb 100644 --- a/bin/load-spark-env.sh +++ b/bin/load-spark-env.sh @@ -20,6 +20,7 @@ # This script loads spark-env.sh if it exists, and ensures it is only loaded once. # spark-env.sh is loaded from SPARK_CONF_DIR if set, or within the current directory's # conf/ subdirectory. +FWDIR="$(cd "`dirname "$0"`"/..; pwd)" if [ -z "$SPARK_ENV_LOADED" ]; then export SPARK_ENV_LOADED=1 @@ -41,8 +42,8 @@ fi if [ -z "$SPARK_SCALA_VERSION" ]; then - ASSEMBLY_DIR2="$SPARK_HOME/assembly/target/scala-2.11" - ASSEMBLY_DIR1="$SPARK_HOME/assembly/target/scala-2.10" + ASSEMBLY_DIR2="$FWDIR/assembly/target/scala-2.11" + ASSEMBLY_DIR1="$FWDIR/assembly/target/scala-2.10" if [[ -d "$ASSEMBLY_DIR2" && -d "$ASSEMBLY_DIR1" ]]; then echo -e "Presence of build for both scala versions(SCALA 2.10 and SCALA 2.11) detected." 1>&2 |