From 90d6b223a633fff2c94019bfb1ae35ce6a7a0002 Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Tue, 6 Jul 2021 14:58:43 -0500 Subject: [PATCH] [target/windows] Fix KBN_PATH_CONF expansion in bin/*.bat (#104517) When setting the environment variable KBN_PATH_CONF in Windows, paths containing special characters will be expanded and interpreted, instead of being treated as a string. This wraps `%KBN_PATH_CONF%` in quotes to prevent this. Testing: 1) set "KBN_PATH_CONF=C:\With space\special()%$characters\kibana\config" 2) bin\kibana*.bat should run --- src/dev/build/tasks/bin/scripts/kibana-encryption-keys.bat | 2 +- src/dev/build/tasks/bin/scripts/kibana-keystore.bat | 2 +- src/dev/build/tasks/bin/scripts/kibana-plugin.bat | 2 +- src/dev/build/tasks/bin/scripts/kibana.bat | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dev/build/tasks/bin/scripts/kibana-encryption-keys.bat b/src/dev/build/tasks/bin/scripts/kibana-encryption-keys.bat index 9221af3142e6..1b065dd785d8 100755 --- a/src/dev/build/tasks/bin/scripts/kibana-encryption-keys.bat +++ b/src/dev/build/tasks/bin/scripts/kibana-encryption-keys.bat @@ -13,7 +13,7 @@ If Not Exist "%NODE%" ( ) set CONFIG_DIR=%KBN_PATH_CONF% -If [%KBN_PATH_CONF%] == [] ( +If ["%KBN_PATH_CONF%"] == [] ( set "CONFIG_DIR=%DIR%\config" ) diff --git a/src/dev/build/tasks/bin/scripts/kibana-keystore.bat b/src/dev/build/tasks/bin/scripts/kibana-keystore.bat index c40145e7d681..11925dc4e70e 100755 --- a/src/dev/build/tasks/bin/scripts/kibana-keystore.bat +++ b/src/dev/build/tasks/bin/scripts/kibana-keystore.bat @@ -13,7 +13,7 @@ If Not Exist "%NODE%" ( ) set CONFIG_DIR=%KBN_PATH_CONF% -If [%KBN_PATH_CONF%] == [] ( +If ["%KBN_PATH_CONF%"] == [] ( set "CONFIG_DIR=%DIR%\config" ) diff --git a/src/dev/build/tasks/bin/scripts/kibana-plugin.bat b/src/dev/build/tasks/bin/scripts/kibana-plugin.bat index d1282f8cf32a..169895082b0c 100755 --- a/src/dev/build/tasks/bin/scripts/kibana-plugin.bat +++ b/src/dev/build/tasks/bin/scripts/kibana-plugin.bat @@ -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" ) diff --git a/src/dev/build/tasks/bin/scripts/kibana.bat b/src/dev/build/tasks/bin/scripts/kibana.bat index 4fc62804ca9a..2b2ce84ebb92 100755 --- a/src/dev/build/tasks/bin/scripts/kibana.bat +++ b/src/dev/build/tasks/bin/scripts/kibana.bat @@ -15,7 +15,7 @@ If Not Exist "%NODE%" ( ) set CONFIG_DIR=%KBN_PATH_CONF% -If [%KBN_PATH_CONF%] == [] ( +If ["%KBN_PATH_CONF%"] == [] ( set "CONFIG_DIR=%DIR%\config" )