github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Windows] Fix string comparison in bat scripts for default dir. (#158517)

Browse source 
## Summary
 
Fixes #137477

The `node.options` file was not being found if `KBN_PATH_CONF` was not
set because the default directory fallback condition was failing.

`kibana.bat` before fix, can see the flag I added in
`config/node.options` is missing and default options are used:


![broken](178f75a5-f3ec-4785-bd7c-aa609e43b786)


The flag is correctly added after fix:


![fixed](f607a7b3-cc04-40ea-9608-db6466b0333f)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Brad White 2023-05-26 09:26:56 -07:00 • committed by GitHub
parent f664e49fbb
commit 7655cb9e9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/dev/build/tasks/bin/scripts/kibana-encryption-keys.bat
View file

@ -14,7 +14,7 @@ If Not Exist "%NODE%" (
)
set CONFIG_DIR=%KBN_PATH_CONF%
If ["%KBN_PATH_CONF%"] == [] (
If ["%KBN_PATH_CONF%"] == [""] (
set "CONFIG_DIR=%DIR%\config"
)

2
src/dev/build/tasks/bin/scripts/kibana-health-gateway.bat
View file

@ -14,7 +14,7 @@ If Not Exist "%NODE%" (
)
set CONFIG_DIR=%KBN_PATH_CONF%
If ["%KBN_PATH_CONF%"] == [] (
If ["%KBN_PATH_CONF%"] == [""] (
set "CONFIG_DIR=%DIR%\config"
)

2
src/dev/build/tasks/bin/scripts/kibana-keystore.bat
View file

@ -14,7 +14,7 @@ If Not Exist "%NODE%" (
)
set CONFIG_DIR=%KBN_PATH_CONF%
If ["%KBN_PATH_CONF%"] == [] (
If ["%KBN_PATH_CONF%"] == [""] (
set "CONFIG_DIR=%DIR%\config"
)

2
src/dev/build/tasks/bin/scripts/kibana-plugin.bat
View file

@ -14,7 +14,7 @@ If Not Exist "%NODE%" (
)
set CONFIG_DIR=%KBN_PATH_CONF%
If ["%KBN_PATH_CONF%"] == [] (
If ["%KBN_PATH_CONF%"] == [""] (
set "CONFIG_DIR=%DIR%\config"
)

2
src/dev/build/tasks/bin/scripts/kibana-setup.bat
View file

@ -14,7 +14,7 @@ If Not Exist "%NODE%" (
)
set CONFIG_DIR=%KBN_PATH_CONF%
If ["%KBN_PATH_CONF%"] == [] (
If ["%KBN_PATH_CONF%"] == [""] (
set "CONFIG_DIR=%DIR%\config"
)

2
src/dev/build/tasks/bin/scripts/kibana-verification-code.bat
View file

@ -14,7 +14,7 @@ If Not Exist "%NODE%" (
)
set CONFIG_DIR=%KBN_PATH_CONF%
If ["%KBN_PATH_CONF%"] == [] (
If ["%KBN_PATH_CONF%"] == [""] (
set "CONFIG_DIR=%DIR%\config"
)

2
src/dev/build/tasks/bin/scripts/kibana.bat
View file

@ -14,7 +14,7 @@ If Not Exist "%NODE%" (
)
set CONFIG_DIR=%KBN_PATH_CONF%
If ["%KBN_PATH_CONF%"] == [] (
If ["%KBN_PATH_CONF%"] == [""] (
set "CONFIG_DIR=%DIR%\config"
)