changed the way dp0 is used to accept spaces in path

Author: Jonathan Maurer

bin/beeline.cmd

@@ -1,5 +1,5 @@
 @echo off
-
+pushd %~dp0
 rem
 rem Licensed to the Apache Software Foundation (ASF) under one or more
 rem contributor license agreements.  See the NOTICE file distributed with
@@ -17,5 +17,5 @@ rem See the License for the specific language governing permissions and
 rem limitations under the License.
 rem
 
-set SPARK_HOME=%~dp0..
-cmd /V /E /C %SPARK_HOME%\bin\spark-class.cmd org.apache.hive.beeline.BeeLine %*
+cmd /V /E /C spark-class.cmd org.apache.hive.beeline.BeeLine %*
+popd

bin/load-spark-env.cmd

@@ -1,4 +1,5 @@
 @echo off
+pushd %~dp0
 
 rem
 rem Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,7 +28,7 @@ if [%SPARK_ENV_LOADED%] == [] (
   if not [%SPARK_CONF_DIR%] == [] (
     set user_conf_dir=%SPARK_CONF_DIR%
   ) else (
-    set user_conf_dir=%~dp0..\conf
+    set user_conf_dir=\conf
   )
 
   call :LoadSparkEnv
@@ -57,3 +58,4 @@ exit /b 0
 if exist "%user_conf_dir%\spark-env.cmd" (
   call "%user_conf_dir%\spark-env.cmd"
 )
+popd

bin/pyspark.cmd

@@ -1,4 +1,5 @@
 @echo off
+pushd %~dp0
 
 rem
 rem Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,4 +21,5 @@ rem
 rem This is the entry point for running PySpark. To avoid polluting the
 rem environment, it just launches a new cmd to do the real work.
 
-cmd /V /E /C "%~dp0pyspark2.cmd" %*
+cmd /V /E /C pyspark2.cmd %*
+popd

bin/pyspark2.cmd

@@ -1,4 +1,5 @@
 @echo off
+pushd %~dp0
 
 rem
 rem Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +19,7 @@ rem limitations under the License.
 rem
 
 rem Figure out where the Spark framework is installed
-set SPARK_HOME=%~dp0..
+set SPARK_HOME=..\
 
 call %SPARK_HOME%\bin\load-spark-env.cmd
 set _SPARK_CMD_USAGE=Usage: bin\pyspark.cmd [options]
@@ -36,3 +37,4 @@ set OLD_PYTHONSTARTUP=%PYTHONSTARTUP%
 set PYTHONSTARTUP=%SPARK_HOME%\python\pyspark\shell.py
 
 call %SPARK_HOME%\bin\spark-submit2.cmd pyspark-shell-main --name "PySparkShell" %*
+popd

bin/run-example.cmd

@@ -1,4 +1,5 @@
 @echo off
+pushd %~dp0
 
 rem
 rem Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,4 +21,5 @@ rem
 rem This is the entry point for running a Spark example. To avoid polluting
 rem the environment, it just launches a new cmd to do the real work.
 
-cmd /V /E /C "%~dp0run-example2.cmd" %*
+cmd /V /E /C run-example2.cmd %*
+popd

bin/run-example2.cmd

@@ -1,4 +1,5 @@
 @echo off
+pushd %~dp0
 
 rem
 rem Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,10 +21,7 @@ rem
 set SCALA_VERSION=2.10
 
 rem Figure out where the Spark framework is installed
-set FWDIR=%~dp0..\
-
-rem Export this as SPARK_HOME
-set SPARK_HOME=%FWDIR%
+set SPARK_HOME=..\
 
 call %SPARK_HOME%\bin\load-spark-env.cmd
 
@@ -36,12 +34,12 @@ if not "x%1"=="x" goto arg_given
   goto exit
 :arg_given
 
-set EXAMPLES_DIR=%FWDIR%examples
+set EXAMPLES_DIR=%SPARK_HOME%examples
 
 rem Figure out the JAR file that our examples were packaged into.
 set SPARK_EXAMPLES_JAR=
-if exist "%FWDIR%RELEASE" (
-  for %%d in ("%FWDIR%lib\spark-examples*.jar") do (
+if exist "%SPARK_HOME%RELEASE" (
+  for %%d in ("%SPARK_HOME%lib\spark-examples*.jar") do (
     set SPARK_EXAMPLES_JAR=%%d
   )
 ) else (
@@ -80,9 +78,10 @@ if "%~1" neq "" (
 )
 if defined ARGS set ARGS=%ARGS:~1%
 
-call "%FWDIR%bin\spark-submit.cmd" ^
+call "%SPARK_HOME%bin\spark-submit.cmd" ^
   --master %EXAMPLE_MASTER% ^
   --class %EXAMPLE_CLASS% ^
   "%SPARK_EXAMPLES_JAR%" %ARGS%
 
 :exit
+popd

bin/spark-class.cmd

@@ -1,4 +1,5 @@
 @echo off
+pushd %~dp0
 
 rem
 rem Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,4 +21,5 @@ rem
 rem This is the entry point for running a Spark class. To avoid polluting
 rem the environment, it just launches a new cmd to do the real work.
 
-cmd /V /E /C "%~dp0spark-class2.cmd" %*
+cmd /V /E /C spark-class2.cmd %*
+popd

bin/spark-class2.cmd

@@ -1,4 +1,5 @@
 @echo off
+pushd %~dp0
 
 rem
 rem Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,9 +19,9 @@ rem limitations under the License.
 rem
 
 rem Figure out where the Spark framework is installed
-set SPARK_HOME=%~dp0..
+set SPARK_HOME=..\
 
-call %SPARK_HOME%\bin\load-spark-env.cmd
+call %SPARK_HOME%bin\load-spark-env.cmd
 
 rem Test that an argument was given
 if "x%1"=="x" (
@@ -34,7 +35,7 @@ set SPARK_ASSEMBLY_JAR=0
 if exist "%SPARK_HOME%\RELEASE" (
   set ASSEMBLY_DIR=%SPARK_HOME%\lib
 ) else (
-  set ASSEMBLY_DIR=%SPARK_HOME%\assembly\target\scala-%SPARK_SCALA_VERSION%
+  set ASSEMBLY_DIR=%SPARK_HOME\%assembly\target\scala-%SPARK_SCALA_VERSION%
 )
 
 for %%d in (%ASSEMBLY_DIR%\spark-assembly*hadoop*.jar) do (
@@ -68,3 +69,4 @@ for /f "tokens=*" %%i in (%LAUNCHER_OUTPUT%) do (
 )
 del %LAUNCHER_OUTPUT%
 %SPARK_CMD%
+popd

bin/spark-shell.cmd

@@ -1,4 +1,5 @@
 @echo off
+pushd %~dp0
 
 rem
 rem Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,4 +21,5 @@ rem
 rem This is the entry point for running Spark shell. To avoid polluting the
 rem environment, it just launches a new cmd to do the real work.
 
-cmd /V /E /C "%~dp0spark-shell2.cmd" %*
+cmd /V /E /C spark-shell2.cmd %*
+popd

bin/spark-shell2.cmd

@@ -1,4 +1,5 @@
 @echo off
+pushd %~dp0
 
 rem
 rem Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,7 +18,6 @@ rem See the License for the specific language governing permissions and
 rem limitations under the License.
 rem
 
-set SPARK_HOME=%~dp0..
 set _SPARK_CMD_USAGE=Usage: .\bin\spark-shell.cmd [options]
 
 rem SPARK-4161: scala does not assume use of the java classpath,
@@ -32,4 +32,5 @@ if "x%SPARK_SUBMIT_OPTS%"=="x" (
 set SPARK_SUBMIT_OPTS="%SPARK_SUBMIT_OPTS% -Dscala.usejavacp=true"
 
 :run_shell
-%SPARK_HOME%\bin\spark-submit2.cmd --class org.apache.spark.repl.Main --name "Spark shell" %*
+spark-submit2.cmd --class org.apache.spark.repl.Main --name "Spark shell" %*
+popd