Repository: spark Updated Branches: refs/heads/branch-1.3 0a903059c -> 2dc94cd8b
[SPARK-5396] Syntax error in spark scripts on windows. Modified syntax error in spark-submit2.cmd. Command prompt doesn't have "defined" operator. Author: Masayoshi TSUZUKI <tsudu...@oss.nttdata.co.jp> Closes #4428 from tsudukim/feature/SPARK-5396 and squashes the following commits: ec18465 [Masayoshi TSUZUKI] [SPARK-5396] Syntax error in spark scripts on windows. (cherry picked from commit c01b9852ea2f7d453249b07d89e62af71bd26e3d) Signed-off-by: Andrew Or <and...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2dc94cd8 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2dc94cd8 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2dc94cd8 Branch: refs/heads/branch-1.3 Commit: 2dc94cd8bddd7925e2884716505cd35a3a0bb046 Parents: 0a90305 Author: Masayoshi TSUZUKI <tsudu...@oss.nttdata.co.jp> Authored: Fri Feb 6 10:58:26 2015 -0800 Committer: Andrew Or <and...@databricks.com> Committed: Fri Feb 6 10:58:55 2015 -0800 ---------------------------------------------------------------------- bin/spark-submit2.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/2dc94cd8/bin/spark-submit2.cmd ---------------------------------------------------------------------- diff --git a/bin/spark-submit2.cmd b/bin/spark-submit2.cmd index 12244a9..446cbc7 100644 --- a/bin/spark-submit2.cmd +++ b/bin/spark-submit2.cmd @@ -25,7 +25,7 @@ set ORIG_ARGS=%* rem Reset the values of all variables used set SPARK_SUBMIT_DEPLOY_MODE=client -if not defined %SPARK_CONF_DIR% ( +if [%SPARK_CONF_DIR%] == [] ( set SPARK_CONF_DIR=%SPARK_HOME%\conf ) set SPARK_SUBMIT_PROPERTIES_FILE=%SPARK_CONF_DIR%\spark-defaults.conf --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
