diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-16 23:18:15 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-16 23:18:15 -0800 |
| commit | d749d472b37448edb322bc7208a3db925c9a4fc2 (patch) | |
| tree | aeda5b4565d589f981f67b94d18a0f4f235144b4 | |
| parent | d4fd89e3c88ea67c755597db2710e99ac7113073 (diff) | |
| parent | 4e510b0b0c8a69cfe0ee037b37661caf9bf1d057 (diff) | |
| download | spark-d749d472b37448edb322bc7208a3db925c9a4fc2.tar.gz spark-d749d472b37448edb322bc7208a3db925c9a4fc2.tar.bz2 spark-d749d472b37448edb322bc7208a3db925c9a4fc2.zip | |
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
| -rwxr-xr-x[-rw-r--r--] | bin/spark-class2.cmd | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | bin/spark-shell.cmd | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/spark-class2.cmd b/bin/spark-class2.cmd index 460e661476..80818c78ec 100644..100755 --- 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% diff --git a/bin/spark-shell.cmd b/bin/spark-shell.cmd index 23973e3e3d..99799128eb 100644..100755 --- 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 %* |