Skip to content

Avoid usage of deployment variables on upgrade #15262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alberpilot merged 3 commits into from
Nov 4, 2022
Merged

Avoid usage of deployment variables on upgrade #15262

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e467aa
Change CustomAction conditions
DFolchA Oct 28, 2022
e328665
Merge branch '4.3' of https://github.com/wazuh/wazuh into 15245-wpk-u…
DFolchA Nov 3, 2022
cf6db3c
Add check for installation to deployment variables
DFolchA Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/win32/wazuh-installer.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,8 @@
<Custom Action="DeleteOssecService" After="StopOssecService">OSSECINSTALLED</Custom>

<!-- Install functions -->
<Custom Action="SetCustomActionDataValue" After="InstallInitialize">NOT Installed</Custom>
<Custom Action="CustomAction_InstallerScripts" After="SetCustomActionDataValue">NOT Installed</Custom>

<Custom Action="SetCustomActionDataValue" After="InstallInitialize">(NOT WIX_UPGRADE_DETECTED) AND (NOT PATCH) AND (NOT Installed)</Custom>
<Custom Action="CustomAction_InstallerScripts" After="SetCustomActionDataValue">(NOT WIX_UPGRADE_DETECTED) AND (NOT PATCH) AND (NOT Installed)</Custom>
<!-- Stop the service as soon as possible on uninstall, and only on uninstall, in order to unlock the files and folders that must be deleted. -->
<Custom Action="SetRemoveAllDataValue" Before="InstallFinalize">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
<Custom Action="CustomAction_RemoveAllScript" After="SetRemoveAllDataValue">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
Expand Down