Commit graph

6 commits

Author SHA1 Message Date
mergify[bot]
905ff93cec
Fix pqcheck and pqrepair on Windows (#17210) (#17263)
A recent change to pqheck, attempted to address an issue where the
pqcheck would not on Windows mahcines when located in a folder containing
a space, such as "C:\program files\elastic\logstash". While this fixed an
issue with spaces in folders, it introduced a new issue related to Java options,
and the pqcheck was still unable to run on Windows.

This PR attempts to address the issue, by removing the quotes around the Java options,
which caused the option parsing to fail, and instead removes the explicit setting of
the classpath - the use of `set CLASSPATH=` in the `:concat` function is sufficient
to set the classpath, and should also fix the spaces issue

Fixes: #17209
(cherry picked from commit ba5f21576c)

Co-authored-by: Rob Bavey <rob.bavey@elastic.co>
2025-03-07 16:13:14 -05:00
Alex S
bc0b9556bd
Add quotes to fix path handling in pqcheck.bat (#16205) 2024-06-26 11:05:17 +01:00
Andrea Selva
a8bd90c22d
Quotes java executable path in case it contains spaces (#13881)
Updates all Windows batch scripts used as CLI tools to quotes the %JAVACMD% to avoid path problems when the path contains spaces.
2022-03-14 18:17:38 +01:00
Andrea Selva
0084492494
Fix Logstash cli tools to use the selected JDK under Windows (#13839)
Some Logstash tools invokes directly the JRuby intepreter. The interpreter uses the JVM pointed by two environment variables:
- JAVACMD
- JAVA_HOME\bin\java.exe

The setup.bat script exported the selected JVM under the env var named JAVA, which isn't recognized by vendored jruby.
This commit fixes it renaming to JAVACMD.
2022-03-07 15:05:52 +01:00
André Letterer
03c1ab94ff Update pqcheck.bat
Fixes #11754
2020-04-21 16:36:26 +00:00
André Letterer
902931cb85 tools convert to batch files (#11753)
Fixes #11754
2020-04-21 16:36:26 +00:00