Updated Branches: refs/heads/branch-0.9 4ae8a4b39 -> 7b0d5a5f3
Merge pull request #451 from Qiuzhuang/master Fixed Window spark shell launch script error. JIRA SPARK-1029:https://spark-project.atlassian.net/browse/SPARK-1029 (cherry picked from commit d749d472b37448edb322bc7208a3db925c9a4fc2) Signed-off-by: Patrick Wendell <pwend...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/7b0d5a5f Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/7b0d5a5f Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/7b0d5a5f Branch: refs/heads/branch-0.9 Commit: 7b0d5a5f306b0adb6590eb551096939d0c617142 Parents: 4ae8a4b Author: Patrick Wendell <pwend...@gmail.com> Authored: Thu Jan 16 23:18:15 2014 -0800 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Thu Jan 16 23:18:48 2014 -0800 ---------------------------------------------------------------------- bin/spark-class2.cmd | 2 +- bin/spark-shell.cmd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/7b0d5a5f/bin/spark-class2.cmd ---------------------------------------------------------------------- diff --git a/bin/spark-class2.cmd b/bin/spark-class2.cmd old mode 100644 new mode 100755 index 460e661..80818c7 --- a/bin/spark-class2.cmd +++ b/bin/spark-class2.cmd @@ -73,7 +73,7 @@ for %%d in ("%TOOLS_DIR%\target\scala-%SCALA_VERSION%\spark-tools*assembly*.jar" rem Compute classpath using external script set DONT_PRINT_CLASSPATH=1 -call "%FWDIR%sbin\compute-classpath.cmd" +call "%FWDIR%bin\compute-classpath.cmd" set DONT_PRINT_CLASSPATH=0 set CLASSPATH=%CLASSPATH%;%SPARK_TOOLS_JAR% http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/7b0d5a5f/bin/spark-shell.cmd ---------------------------------------------------------------------- diff --git a/bin/spark-shell.cmd b/bin/spark-shell.cmd old mode 100644 new mode 100755 index 23973e3..9979912 --- a/bin/spark-shell.cmd +++ b/bin/spark-shell.cmd @@ -18,6 +18,6 @@ rem limitations under the License. rem rem Find the path of sbin -set SBIN=%~dp0..\sbin\ +set BIN=%~dp0..\bin\ -cmd /V /E /C %SBIN%spark-class2.cmd org.apache.spark.repl.Main %* +cmd /V /E /C %BIN%spark-class2.cmd org.apache.spark.repl.Main %*
