Github user HyukjinKwon commented on a diff in the pull request:
https://github.com/apache/spark/pull/23098#discussion_r235322452
--- Diff: bin/load-spark-env.cmd ---
@@ -21,37 +21,42 @@ rem This script loads spark-env.cmd if it exists, and
ensures it is only loaded
rem spark-env.cmd is loaded from SPARK_CONF_DIR if set, or within the
current directory's
rem conf\ subdirectory.
+set SPARK_ENV_CMD="spark-env.cmd"
if [%SPARK_ENV_LOADED%] == [] (
set SPARK_ENV_LOADED=1
if [%SPARK_CONF_DIR%] == [] (
set SPARK_CONF_DIR=%~dp0..\conf
)
- call :LoadSparkEnv
+ set SPARK_ENV_CMD="%SPARK_CONF_DIR%/%SPARK_ENV_CMD%"
+ if exist "%SPARK_ENV_CMD%" (
+ call "%SPARK_ENV_CMD%"
+ )
)
rem Setting SPARK_SCALA_VERSION if not already set.
-set ASSEMBLY_DIR2="%SPARK_HOME%\assembly\target\scala-2.11"
-set ASSEMBLY_DIR1="%SPARK_HOME%\assembly\target\scala-2.12"
-
-if [%SPARK_SCALA_VERSION%] == [] (
-
- if exist %ASSEMBLY_DIR2% if exist %ASSEMBLY_DIR1% (
- echo "Presence of build for multiple Scala versions detected."
- echo "Either clean one of them or, set SPARK_SCALA_VERSION in
spark-env.cmd."
- exit 1
- )
- if exist %ASSEMBLY_DIR2% (
- set SPARK_SCALA_VERSION=2.11
- ) else (
- set SPARK_SCALA_VERSION=2.12
- )
-)
+rem TODO: revisit for Scala 2.13 support
+set SPARK_SCALA_VERSION=2.12
--- End diff --
Nope, it takes as is including quotes ... haha odd (to me).
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
