From ec006bddd1c3b50ccce18e086e34fad982b747f1 Mon Sep 17 00:00:00 2001
From: Kentaro Hayashi <hayashi@clear-code.com>
Date: Wed, 13 Sep 2023 10:53:21 +0900
Subject: [PATCH] msi: support path which contains space

When installing fluent-package to c:\Program Files, it must be
escaped correctly.

^&quot; is treated as ^", so it intended to execute:

  "cmd" /c "fsutil ... "c:\Program Files .." "c:\Program Files...""

Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
---
 fluent-package/msi/source.wxs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fluent-package/msi/source.wxs b/fluent-package/msi/source.wxs
index 7bd982642..faeb7f1b7 100644
--- a/fluent-package/msi/source.wxs
+++ b/fluent-package/msi/source.wxs
@@ -185,7 +185,7 @@
     <Property Id="InstallFluentdWinSvc" Value=" "/>
     <CustomAction Id="SetInstallFluentdWinSvcCommand"
                   Property="InstallFluentdWinSvc"
-                  Value="&quot;[FLUENTPROJECTLOCATION]fluentd.bat&quot; --reg-winsvc i --reg-winsvc-delay-start --reg-winsvc-fluentdopt &quot;-c [FLUENTPROJECTLOCATION]etc\fluent\fluentd.conf -o [FLUENTPROJECTLOCATION]fluentd.log&quot;"/>
+                  Value="&quot;[FLUENTPROJECTLOCATION]fluentd.bat&quot; --reg-winsvc i --reg-winsvc-delay-start --reg-winsvc-fluentdopt &quot;-c '[FLUENTPROJECTLOCATION]etc\fluent\fluentd.conf' -o '[FLUENTPROJECTLOCATION]fluentd.log'&quot;"/>
     <CustomAction Id="InstallFluentdWinSvc"
                   BinaryKey="WixCA"
                   DllEntry="WixQuietExec64"
@@ -196,7 +196,7 @@
     <Property Id="CreateCompatTdAgentBat" Value=" "/>
     <CustomAction Id="SetCreateCompatTdAgentBat"
                   Property="CreateCompatTdAgentBat"
-                  Value="&quot;cmd&quot; /c &quot;fsutil hardlink create [FLUENTPROJECTLOCATION]bin\td-agent.bat [FLUENTPROJECTLOCATION]fluentd.bat&quot;"/>
+                  Value="&quot;cmd&quot; /c &quot;fsutil hardlink create ^&quot;[FLUENTPROJECTLOCATION]bin\td-agent.bat^&quot; ^&quot;[FLUENTPROJECTLOCATION]fluentd.bat^&quot;&quot;"/>
     <CustomAction Id="CreateCompatTdAgentBat"
                   BinaryKey="WixCA"
                   DllEntry="WixQuietExec64"
@@ -206,7 +206,7 @@
     <Property Id="CreateCompatTdAgentGemBat" Value=" "/>
     <CustomAction Id="SetCreateCompatTdAgentGemBat"
                   Property="CreateCompatTdAgentGemBat"
-                  Value="&quot;cmd&quot; /c &quot;fsutil hardlink create [FLUENTPROJECTLOCATION]bin\td-agent-gem.bat [FLUENTPROJECTLOCATION]fluent-gem.bat&quot;"/>
+                  Value="&quot;cmd&quot; /c &quot;fsutil hardlink create ^&quot;[FLUENTPROJECTLOCATION]bin\td-agent-gem.bat^&quot; ^&quot;[FLUENTPROJECTLOCATION]fluent-gem.bat^&quot;&quot;"/>
     <CustomAction Id="CreateCompatTdAgentGemBat"
                   BinaryKey="WixCA"
                   DllEntry="WixQuietExec64"
@@ -217,7 +217,7 @@
     <Property Id="DeleteCompatTdAgentBat" Value=" "/>
     <CustomAction Id="SetDeleteCompatTdAgentBat"
                   Property="DeleteCompatTdAgentBat"
-                  Value="&quot;cmd&quot; /c &quot;del [FLUENTPROJECTLOCATION]bin\td-agent.bat&quot;"/>
+                  Value="&quot;cmd&quot; /c &quot;del ^&quot;[FLUENTPROJECTLOCATION]bin\td-agent.bat^&quot;&quot;"/>
     <CustomAction Id="DeleteCompatTdAgentBat"
                   BinaryKey="WixCA"
                   DllEntry="WixQuietExec64"
@@ -227,7 +227,7 @@
     <Property Id="DeleteCompatTdAgentGemBat" Value=" "/>
     <CustomAction Id="SetDeleteCompatTdAgentGemBat"
                   Property="DeleteCompatTdAgentGemBat"
-                  Value="&quot;cmd&quot; /c &quot;del [FLUENTPROJECTLOCATION]bin\td-agent-gem.bat&quot;"/>
+                  Value="&quot;cmd&quot; /c &quot;del ^&quot;[FLUENTPROJECTLOCATION]bin\td-agent-gem.bat^&quot;&quot;"/>
     <CustomAction Id="DeleteCompatTdAgentGemBat"
                   BinaryKey="WixCA"
                   DllEntry="WixQuietExec64"