msi: keep fluentdopt when previous options is set

Before:

* always reset fluentdopt

After:

* If fluentdopt is empty, set default value
* If fluentdopt configuration is changed from default one, keep it.

Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>

fluent-package/msi/assets/fluent-package-post-fluentdwinsvc.rb

@@ -0,0 +1,24 @@
+require 'fileutils'
+require "win32/service"
+require "win32/registry"
+require "optparse"
+include Win32
+
+install_dir = "#{ARGV[0]}"
+
+default_fluentdwinsvc = "-c '#{install_dir}\etc\fluent\fluentd.conf' -o '#{install_dir}\fluentd.log'"
+registory_key = "SYSTEM\\CurrentControlSet\\Services\\fluentdwinsvc"
+
+Win32::Registry::HKEY_LOCAL_MACHINE.open(registory_key, Win32::Registry::KEY_ALL_ACCESS) do |reg|
+ begin
+ # Check whether RegValue exists or not
+ previous_fluentdopt = reg['fluentdopt', Win32::Registry::REG_SZ]
+ if previous_fluentdopt != default_fluentdwinsvc
+ puts("fluentdwinsvc: fluentdopt configuration was kept because install path (#{install_dir}) of fluent-package was not changed")
+ end
+ rescue Win32:Registry::Error
+ # As fluentdopt value does not exist, then set default configuration
+ puts("fluentdwinsvc: reset to default fluentdopt configuration")
+ reg['fluentdopt', Win32::Registry::REG_SZ] = default_fluentdwinsvc
+ end
+end

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]bin\ruby.exe&quot; &quot;[FLUENTPROJECTLOCATION]bin\fluent-package-post-fluentdwinsvc.rb&quot; &quot;[FLUENTPROJECTLOCATION]&quot;"/>
  <CustomAction Id="InstallFluentdWinSvc"
  BinaryKey="WixCA"
  DllEntry="WixQuietExec64"