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

Fix Windows scripts (#14515)

Browse source 
The work done in #14355 to fix the keystore and plugin scripts erroneously included
%JAVA_OPTS% in the command to invoke `jruby`, rather than as an environment variable, which
prevented these scripts from operating correctly, due to `jruby.exe` not handling Java options,
causing the scripts to crash on invocation.

This commit removes the %JAVA_OPTS% - this is already set as an environment variable, and allows the
scripts to operate correctly
This commit is contained in:
Rob Bavey 2022-09-09 09:06:57 -04:00 • committed by GitHub
parent b7b9613c62
commit 5d7fa78e09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/logstash-keystore.bat
View file

@ -9,7 +9,7 @@ if errorlevel 1 (
exit /B %ERRORLEVEL%
)
%JRUBY_BIN% %JAVA_OPTS% "%LS_HOME%\lib\secretstore\cli.rb" %*
%JRUBY_BIN% "%LS_HOME%\lib\secretstore\cli.rb" %*
if errorlevel 1 (
exit /B 1
)

2
bin/logstash-plugin.bat
View file

@ -9,7 +9,7 @@ if errorlevel 1 (
exit /B %ERRORLEVEL%
)
%JRUBY_BIN% %JAVA_OPTS% "%LS_HOME%\lib\pluginmanager\main.rb" %*
%JRUBY_BIN% "%LS_HOME%\lib\pluginmanager\main.rb" %*
if errorlevel 1 (
exit /B 1
)