github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-06-28 09:46:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

Quotes java executable path in case it contains spaces (#13881)

Browse source 
Updates all Windows batch scripts used as CLI tools to quotes the %JAVACMD% to avoid path problems when the path contains spaces.
This commit is contained in:
Andrea Selva 2022-03-14 18:17:38 +01:00 • committed by GitHub
parent 8c79a0067c
commit a8bd90c22d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/benchmark.bat
View file

@ -4,7 +4,7 @@ setlocal enabledelayedexpansion
cd /d "%~dp0.." cd /d "%~dp0.."
for /f %%i in ('cd') do set RESULT=%%i for /f %%i in ('cd') do set RESULT=%%i
%JAVACMD% -cp "!RESULT!\tools\benchmark-cli\build\libs\benchmark-cli.jar;*" ^ "%JAVACMD%" -cp "!RESULT!\tools\benchmark-cli\build\libs\benchmark-cli.jar;*" ^
org.logstash.benchmark.cli.Main %* org.logstash.benchmark.cli.Main %*
endlocal endlocal

2
bin/ingest-convert.bat
View file

@ -4,7 +4,7 @@ setlocal enabledelayedexpansion
cd /d "%~dp0\.." cd /d "%~dp0\.."
for /f %%i in ('cd') do set RESULT=%%i for /f %%i in ('cd') do set RESULT=%%i
%JAVACMD% -cp "!RESULT!\tools\ingest-converter\build\libs\ingest-converter.jar;*" ^ "%JAVACMD%" -cp "!RESULT!\tools\ingest-converter\build\libs\ingest-converter.jar;*" ^
org.logstash.ingest.Pipeline %* org.logstash.ingest.Pipeline %*
endlocal endlocal

4
bin/logstash.bat
View file

@ -42,7 +42,7 @@ for %%i in ("%LS_HOME%\logstash-core\lib\jars\*.jar") do (
) )
@setlocal @setlocal
for /F "usebackq delims=" %%a in (`CALL %JAVACMD% -cp "!CLASSPATH!" "org.logstash.launchers.JvmOptionsParser" "!LS_HOME!" "!LS_JVM_OPTS!" ^|^| echo jvm_options_parser_failed`) do set LS_JAVA_OPTS=%%a for /F "usebackq delims=" %%a in (`CALL "%JAVACMD%" -cp "!CLASSPATH!" "org.logstash.launchers.JvmOptionsParser" "!LS_HOME!" "!LS_JVM_OPTS!" ^|^| echo jvm_options_parser_failed`) do set LS_JAVA_OPTS=%%a
@endlocal & set "MAYBE_JVM_OPTIONS_PARSER_FAILED=%LS_JAVA_OPTS%" & set LS_JAVA_OPTS=%LS_JAVA_OPTS% @endlocal & set "MAYBE_JVM_OPTIONS_PARSER_FAILED=%LS_JAVA_OPTS%" & set LS_JAVA_OPTS=%LS_JAVA_OPTS%
if "%MAYBE_JVM_OPTIONS_PARSER_FAILED%" == "jvm_options_parser_failed" ( if "%MAYBE_JVM_OPTIONS_PARSER_FAILED%" == "jvm_options_parser_failed" (
@ -51,7 +51,7 @@ if "%MAYBE_JVM_OPTIONS_PARSER_FAILED%" == "jvm_options_parser_failed" (
) )
set JAVA_OPTS=%LS_JAVA_OPTS% set JAVA_OPTS=%LS_JAVA_OPTS%
%JAVACMD% %JAVA_OPTS% -cp "%CLASSPATH%" org.logstash.Logstash %* "%JAVACMD%" %JAVA_OPTS% -cp "%CLASSPATH%" org.logstash.Logstash %*
goto :end goto :end

2
bin/pqcheck.bat
View file

@ -16,7 +16,7 @@ for %%i in ("%LS_HOME%\logstash-core\lib\jars\*.jar") do (
call :concat "%%i" call :concat "%%i"
) )
%JAVACMD% %JAVA_OPTS% -cp "%CLASSPATH%" org.logstash.ackedqueue.PqCheck %* "%JAVACMD%" %JAVA_OPTS% -cp "%CLASSPATH%" org.logstash.ackedqueue.PqCheck %*
:concat :concat
IF not defined CLASSPATH ( IF not defined CLASSPATH (

2
bin/pqrepair.bat
View file

@ -16,7 +16,7 @@ for %%i in ("%LS_HOME%\logstash-core\lib\jars\*.jar") do (
call :concat "%%i" call :concat "%%i"
) )
%JAVACMD% %JAVA_OPTS% -cp "%CLASSPATH%" org.logstash.ackedqueue.PqRepair %* "%JAVACMD%" %JAVA_OPTS% -cp "%CLASSPATH%" org.logstash.ackedqueue.PqRepair %*
:concat :concat
IF not defined CLASSPATH ( IF not defined CLASSPATH (

2
bin/setup.bat
View file

@ -36,7 +36,7 @@ if defined LS_JAVA_HOME (
) )
) )
if not exist %JAVACMD% ( if not exist "%JAVACMD%" (
echo could not find java; set JAVA_HOME or ensure java is in PATH 1>&2 echo could not find java; set JAVA_HOME or ensure java is in PATH 1>&2
exit /b 1 exit /b 1
) )