More conservative : Check before adding quotes in spark/bin/spark-sub…

…mit.cmd files. In fact the same effect as last commit because currently it doesn't work if full path to spark-submit.cmd has space.
apache · Aug 26, 2016 · 7059639 · 7059639
1 parent a6b1c60
commit 7059639
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/bin/spark-class.cmd b/bin/spark-class.cmd
@@ -20,4 +20,9 @@ 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 %*
+echo "%~dp0spark-class2.cmd"|findstr /C:" "
+if %ERRORLEVEL% EQU 0 (
+    cmd /V /E /C "%~dp0spark-class2.cmd" %*
+) else (
+    cmd /V /E /C %~dp0spark-class2.cmd %*
+)
diff --git a/bin/spark-shell.cmd b/bin/spark-shell.cmd
@@ -20,4 +20,9 @@ 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 %*
+echo "%~dp0spark-shell2.cmd"|findstr /C:" "
+if %ERRORLEVEL% EQU 0 (
+    cmd /V /E /C "%~dp0spark-shell2.cmd" %*
+) else (
+    cmd /V /E /C %~dp0spark-shell2.cmd %*
+)
diff --git a/bin/spark-submit.cmd b/bin/spark-submit.cmd
@@ -20,4 +20,9 @@ rem
 rem This is the entry point for running Spark submit. To avoid polluting the
 rem environment, it just launches a new cmd to do the real work.
 
-cmd /V /E /C %~dp0spark-submit2.cmd %*
+echo "%~dp0spark-submit2.cmd"|findstr /C:" "
+if %ERRORLEVEL% EQU 0 (
+    cmd /V /E /C "%~dp0spark-submit2.cmd" %*
+) else (
+    cmd /V /E /C %~dp0spark-submit2.cmd %*
+)