Module: check_mk Branch: master Commit: 901b4bec2afea393104bdb4a814e30119d7da670 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=901b4bec2afea3… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Tue May 19 15:29:29 2015 +0200 windows agent: updated msi templates for vanilla and baked container --- doc/treasures/windows_msi/check_mk_agent_baked.wxs | 28 +++++++++++++++----- .../windows_msi/check_mk_agent_vanilla.wxs | 26 ++++++++++++++---- 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/doc/treasures/windows_msi/check_mk_agent_baked.wxs b/doc/treasures/windows_msi/check_mk_agent_baked.wxs index 5b7c47c..95c42d5 100644 --- a/doc/treasures/windows_msi/check_mk_agent_baked.wxs +++ b/doc/treasures/windows_msi/check_mk_agent_baked.wxs @@ -81,6 +81,20 @@ Impersonate="no" Return ="ignore"/> + <CustomAction Id="create_custom_folders" + Directory ="INSTALLDIR" + ExeCommand ='"[SystemFolder]\Cmd.exe" /c mkdir "[INSTALLDIR]state" "[INSTALLDIR]config" "[INSTALLDIR]log" "[INSTALLDIR]temp" "[INSTALLDIR]spool"' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> + + <CustomAction Id="remove_custom_folders" + Directory ="INSTALLDIR" + ExeCommand ='"[SystemFolder]\Cmd.exe" /c rmdir /s /q "[INSTALLDIR]state" "[INSTALLDIR]config" "[INSTALLDIR]log" "[INSTALLDIR]temp" "[INSTALLDIR]spool"' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> + <CustomAction Id="uninstall_plugins" Directory ="INSTALLDIR" ExeCommand ='[INSTALLDIR]uninstall_plugins.bat' @@ -103,15 +117,17 @@ Return ="ignore"/> <InstallExecuteSequence> - <Custom Action="unpack_plugins" Before="InstallFinalize">NOT REMOVE="ALL"</Custom> - <Custom Action="install_service" Before="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> - <Custom Action="start_service" Before="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + <Custom Action="create_custom_folders" Sequence="6569" >NOT REMOVE="ALL"</Custom> + <Custom Action="unpack_plugins" Sequence="6579" >NOT REMOVE="ALL"</Custom> + <Custom Action="install_service" Sequence="6589" >NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + <Custom Action="start_service" Sequence="6599" >NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> </InstallExecuteSequence> <InstallExecuteSequence> - <Custom Action="stop_service" After="InstallInitialize">REMOVE="ALL"</Custom> - <Custom Action='uninstall_service' After='InstallInitialize'>REMOVE="ALL"</Custom> - <Custom Action='uninstall_plugins' After='InstallInitialize'>REMOVE="ALL"</Custom> + <Custom Action="stop_service" Sequence="1501" >REMOVE="ALL"</Custom> + <Custom Action='uninstall_service' Sequence="1502" >REMOVE="ALL"</Custom> + <Custom Action='uninstall_plugins' Sequence="1503" >REMOVE="ALL"</Custom> + <Custom Action='remove_custom_folders' Sequence="1504" >(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom> </InstallExecuteSequence> <DirectoryRef Id="INSTALLDIR"> diff --git a/doc/treasures/windows_msi/check_mk_agent_vanilla.wxs b/doc/treasures/windows_msi/check_mk_agent_vanilla.wxs index f67971f..e1b8972 100644 --- a/doc/treasures/windows_msi/check_mk_agent_vanilla.wxs +++ b/doc/treasures/windows_msi/check_mk_agent_vanilla.wxs @@ -74,6 +74,20 @@ Impersonate="no" Return ="ignore"/> + <CustomAction Id="create_custom_folders" + Directory ="INSTALLDIR" + ExeCommand ='"[SystemFolder]\Cmd.exe" /c mkdir "[INSTALLDIR]state" "[INSTALLDIR]config" "[INSTALLDIR]log" "[INSTALLDIR]temp" "[INSTALLDIR]spool"' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> + + <CustomAction Id="remove_custom_folders" + Directory ="INSTALLDIR" + ExeCommand ='"[SystemFolder]\Cmd.exe" /c rmdir /s /q "[INSTALLDIR]state" "[INSTALLDIR]config" "[INSTALLDIR]log" "[INSTALLDIR]temp" "[INSTALLDIR]spool"' + Execute ="deferred" + Impersonate="no" + Return ="ignore"/> + <CustomAction Id="uninstall_plugins" Directory ="INSTALLDIR" ExeCommand ='[INSTALLDIR]uninstall_plugins.bat' @@ -96,14 +110,16 @@ Return ="ignore"/> <InstallExecuteSequence> - <Custom Action="install_service" Before="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> - <Custom Action="start_service" Before="InstallFinalize">NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + <Custom Action="create_custom_folders" Sequence="6588" >NOT REMOVE="ALL"</Custom> + <Custom Action="install_service" Sequence="6589" >NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> + <Custom Action="start_service" Sequence="6599" >NOT REMOVE="ALL" AND INSTALLSERVICE</Custom> </InstallExecuteSequence> <InstallExecuteSequence> - <Custom Action="stop_service" After="InstallInitialize">REMOVE="ALL"</Custom> - <Custom Action='uninstall_service' After='InstallInitialize'>REMOVE="ALL"</Custom> - <Custom Action='uninstall_plugins' After='InstallInitialize'>REMOVE="ALL"</Custom> + <Custom Action="stop_service" Sequence="1501" >REMOVE="ALL"</Custom> + <Custom Action='uninstall_service' Sequence="1502" >REMOVE="ALL"</Custom> + <Custom Action='uninstall_plugins' Sequence="1503" >REMOVE="ALL"</Custom> + <Custom Action='remove_custom_folders' Sequence="1504" >(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom> </InstallExecuteSequence> <DirectoryRef Id="INSTALLDIR">