From 25ac1ff607ed1b294a6645642567101521806a7a Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Thu, 29 Jun 2023 17:06:15 +0900 Subject: [PATCH] msi: use / as path separator See https://github.com/fluent/fluentd/issues/1138 Signed-off-by: Kentaro Hayashi --- fluent-package/msi/assets/fluentd.bat | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/fluent-package/msi/assets/fluentd.bat b/fluent-package/msi/assets/fluentd.bat index 677376986..13c0db1d3 100644 --- a/fluent-package/msi/assets/fluentd.bat +++ b/fluent-package/msi/assets/fluentd.bat @@ -6,17 +6,24 @@ if "%~nx0" == "td-agent.bat" ( set FLUENT_PACKAGE_TOPDIR=%~dp0 set TD_AGENT_TOPDIR=%~dp0..\td-agent ) + +@rem Convert path separator from backslash to forwardslash +setlocal enabledelayedexpansion +set FLUENT_PACKAGE_TOPDIR="FLUENT_PACKAGE_TOPDIR=!FLUENT_PACKAGE_TOPDIR:\=/!" +set TD_AGENT_TOPDIR="TD_AGENT_TOPDIR=!TD_AGENT_TOPDIR:\=/!" +endlocal + set PATH=%FLUENT_PACKAGE_TOPDIR%bin;%PATH% set PATH=%FLUENT_PACKAGE_TOPDIR%;%PATH% -set FLUENT_CONF=%TD_AGENT_TOPDIR%\etc\td-agent\td-agent.conf -set FLUENT_PLUGIN=%TD_AGENT_TOPDIR%\etc\td-agent\plugin -set FLUENT_PACKAGE_VERSION=%FLUENT_PACKAGE_TOPDIR%\bin\fluent-package-version.rb +set FLUENT_CONF=%TD_AGENT_TOPDIR%/etc/td-agent/td-agent.conf +set FLUENT_PLUGIN=%TD_AGENT_TOPDIR%/etc/td-agent/plugin +set FLUENT_PACKAGE_VERSION=%FLUENT_PACKAGE_TOPDIR%/bin/fluent-package-version.rb for %%p in (%*) do ( if "%%p"=="--version" ( ruby "%FLUENT_PACKAGE_VERSION%" goto last ) ) -"%FLUENT_PACKAGE_TOPDIR%\bin\fluentd" %* +"%FLUENT_PACKAGE_TOPDIR%/bin/fluentd" %* :last