aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2012-09-24 21:10:31 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2012-09-24 21:10:31 -0700
commit296e24b440d33895d0eae1d5e6d8b35a95469eb2 (patch)
treed004d3f50e7d75777a9f44dc5a3bdf1ca5e4b5b2 /core
parent6eeb379cf86b25975456369cc3de50a41a648b69 (diff)
parentafd8fc0c664d2ec946fa10ffb6f05803ac113c8c (diff)
downloadspark-296e24b440d33895d0eae1d5e6d8b35a95469eb2.tar.gz
spark-296e24b440d33895d0eae1d5e6d8b35a95469eb2.tar.bz2
spark-296e24b440d33895d0eae1d5e6d8b35a95469eb2.zip
Merge pull request #218 from rnpandya/dev
Scripts to start Spark under windows
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala b/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala
index 7043361020..e2a9df275a 100644
--- a/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala
+++ b/core/src/main/scala/spark/deploy/worker/ExecutorRunner.scala
@@ -75,7 +75,8 @@ class ExecutorRunner(
def buildCommandSeq(): Seq[String] = {
val command = jobDesc.command
- val runScript = new File(sparkHome, "run").getCanonicalPath
+ val script = if (System.getProperty("os.name").startsWith("Windows")) "run.cmd" else "run";
+ val runScript = new File(sparkHome, script).getCanonicalPath
Seq(runScript, command.mainClass) ++ command.arguments.map(substituteVariables)
}