c8c481da18
Added word-boundary delimiters so that embedded text such as "-h" within command line options and values doesn't trigger the usage script and exit. Author: Chris Biow <chris.biow@10gen.com> Closes #5816 from cbiow/patch-1 and squashes the following commits: 36b3726 [Chris Biow] Limit help option regex
53 lines
1.8 KiB
Batchfile
53 lines
1.8 KiB
Batchfile
@echo off
|
|
|
|
rem
|
|
rem Licensed to the Apache Software Foundation (ASF) under one or more
|
|
rem contributor license agreements. See the NOTICE file distributed with
|
|
rem this work for additional information regarding copyright ownership.
|
|
rem The ASF licenses this file to You under the Apache License, Version 2.0
|
|
rem (the "License"); you may not use this file except in compliance with
|
|
rem the License. You may obtain a copy of the License at
|
|
rem
|
|
rem http://www.apache.org/licenses/LICENSE-2.0
|
|
rem
|
|
rem Unless required by applicable law or agreed to in writing, software
|
|
rem distributed under the License is distributed on an "AS IS" BASIS,
|
|
rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
rem See the License for the specific language governing permissions and
|
|
rem limitations under the License.
|
|
rem
|
|
|
|
set SPARK_HOME=%~dp0..
|
|
|
|
echo "%*" | findstr " \<--help\> \<-h\>" >nul
|
|
if %ERRORLEVEL% equ 0 (
|
|
call :usage
|
|
exit /b 0
|
|
)
|
|
|
|
rem SPARK-4161: scala does not assume use of the java classpath,
|
|
rem so we need to add the "-Dscala.usejavacp=true" flag manually. We
|
|
rem do this specifically for the Spark shell because the scala REPL
|
|
rem has its own class loader, and any additional classpath specified
|
|
rem through spark.driver.extraClassPath is not automatically propagated.
|
|
if "x%SPARK_SUBMIT_OPTS%"=="x" (
|
|
set SPARK_SUBMIT_OPTS=-Dscala.usejavacp=true
|
|
goto run_shell
|
|
)
|
|
set SPARK_SUBMIT_OPTS="%SPARK_SUBMIT_OPTS% -Dscala.usejavacp=true"
|
|
|
|
:run_shell
|
|
call %SPARK_HOME%\bin\spark-submit2.cmd --class org.apache.spark.repl.Main %*
|
|
set SPARK_ERROR_LEVEL=%ERRORLEVEL%
|
|
if not "x%SPARK_LAUNCHER_USAGE_ERROR%"=="x" (
|
|
call :usage
|
|
exit /b 1
|
|
)
|
|
exit /b %SPARK_ERROR_LEVEL%
|
|
|
|
:usage
|
|
echo %SPARK_LAUNCHER_USAGE_ERROR%
|
|
echo "Usage: .\bin\spark-shell.cmd [options]" >&2
|
|
call %SPARK_HOME%\bin\spark-submit2.cmd --help 2>&1 | findstr /V "Usage" 1>&2
|
|
goto :eof
|