Skip to content

Commit b9babcd

Browse files
committed
Update 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
1 parent 17b13c5 commit b9babcd

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

bin/load-spark-env.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
# This script loads spark-env.sh if it exists, and ensures it is only loaded once.
2121
# spark-env.sh is loaded from SPARK_CONF_DIR if set, or within the current directory's
2222
# conf/ subdirectory.
23+
FWDIR="$(cd "`dirname "$0"`"/..; pwd)"
2324

2425
if [ -z "$SPARK_ENV_LOADED" ]; then
2526
export SPARK_ENV_LOADED=1
@@ -41,8 +42,8 @@ fi
4142

4243
if [ -z "$SPARK_SCALA_VERSION" ]; then
4344

44-
ASSEMBLY_DIR2="$SPARK_HOME/assembly/target/scala-2.11"
45-
ASSEMBLY_DIR1="$SPARK_HOME/assembly/target/scala-2.10"
45+
ASSEMBLY_DIR2="$FWDIR/assembly/target/scala-2.11"
46+
ASSEMBLY_DIR1="$FWDIR/assembly/target/scala-2.10"
4647

4748
if [[ -d "$ASSEMBLY_DIR2" && -d "$ASSEMBLY_DIR1" ]]; then
4849
echo -e "Presence of build for both scala versions(SCALA 2.10 and SCALA 2.11) detected." 1>&2

0 commit comments

Comments
 (0)