Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Windows scripts #14515

Merged
merged 1 commit into from Sep 9, 2022
Merged

Conversation

robbavey
Copy link
Member

@robbavey robbavey commented Sep 8, 2022

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

The work done in elastic#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
Copy link
Contributor

@kaisecheng kaisecheng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@robbavey robbavey merged commit 5d7fa78 into elastic:main Sep 9, 2022
@robbavey
Copy link
Member Author

robbavey commented Sep 9, 2022

@logstashmachine backport 8.4

github-actions bot pushed a commit that referenced this pull request Sep 9, 2022
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

(cherry picked from commit 5d7fa78)
@github-actions github-actions bot added the v8.4.2 label Sep 9, 2022
robbavey added a commit that referenced this pull request Sep 9, 2022
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

(cherry picked from commit 5d7fa78)

Co-authored-by: Rob Bavey <rob.bavey@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants