msi: migrate to FLUENT_PACKAGE_TOPDIR

Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
fluent · Jul 10, 2023 · 779e0d0 · 779e0d0
1 parent 90550e3
commit 779e0d0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/fluent-package/msi/assets/fluentd.bat b/fluent-package/msi/assets/fluentd.bat
@@ -1,22 +1,19 @@
 @echo off
 if "%~nx0" == "td-agent.bat" (
   set FLUENT_PACKAGE_TOPDIR=%~dp0..\
-  set TD_AGENT_TOPDIR=%~dp0..\..\td-agent
 ) else (
   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_CONF=%FLUENT_PACKAGE_TOPDIR%/etc/fluent/fluentd.conf
+set FLUENT_PLUGIN=%FLUENT_PACKAGE_TOPDIR%/etc/fluent/plugin
 set FLUENT_PACKAGE_VERSION=%FLUENT_PACKAGE_TOPDIR%/bin/fluent-package-version.rb
 for %%p in (%*) do (
     if "%%p"=="--version" (

diff --git a/fluent-package/msi/source.wxs b/fluent-package/msi/source.wxs
@@ -117,7 +117,7 @@
                      Permanent="no"
                      Part="all"
                      System="yes"
-                     Name="TD_AGENT_TOPDIR"
+                     Name="FLUENT_PACKAGE_TOPDIR"
                      Value="[FLUENTPROJECTLOCATION]"/>
       </Component>
     </DirectoryRef>

diff --git a/fluent-package/templates/opt/fluent/share/td-agent.conf.tmpl b/fluent-package/templates/opt/fluent/share/td-agent.conf.tmpl
@@ -25,7 +25,7 @@
   <buffer>
     @type file
 <% if windows? %>
-    path "#{ENV['TD_AGENT_TOPDIR']}/var/log/<%= compat_package_dir %>/buffer/td"
+    path "#{ENV['FLUENT_PACKAGE_TOPDIR']}/var/log/<%= compat_package_dir %>/buffer/td"
 <% else %>
     path /var/log/<%= package_dir %>/buffer/td
 <% end %>
@@ -34,7 +34,7 @@
   <secondary>
     @type file
 <% if windows? %>
-    path "#{ENV['TD_AGENT_TOPDIR']}/var/log/<%= compat_package_dir %>/failed_records"
+    path "#{ENV['FLUENT_PACKAGE_TOPDIR']}/var/log/<%= compat_package_dir %>/failed_records"
 <% else %>
     path /var/log/<%= package_dir %>/failed_records
 <% end %>