summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraliasgar16 <aliasgar.batterywala@msystechnologies.com>2016-11-17 09:49:28 +0530
committeraliasgar16 <aliasgar.batterywala@msystechnologies.com>2016-12-09 19:40:30 +0530
commit85f5dd657ab7370c7cca4fbfaea5970cbd8719dd (patch)
treef76093e3875aab5e61046db638d763ee60173e8a
parent8b356ef7cb3de2b0499e2d1e66b3963ab1f6c51a (diff)
downloadchef-85f5dd657ab7370c7cca4fbfaea5970cbd8719dd.tar.gz
Fixed some bugs in the WIX config.
Signed-off-by: aliasgar16 <aliasgar.batterywala@msystechnologies.com>
-rw-r--r--omnibus/resources/chef/msi/source.wxs.erb12
1 files changed, 3 insertions, 9 deletions
diff --git a/omnibus/resources/chef/msi/source.wxs.erb b/omnibus/resources/chef/msi/source.wxs.erb
index 3aae5fe0a5..3d2692903f 100644
--- a/omnibus/resources/chef/msi/source.wxs.erb
+++ b/omnibus/resources/chef/msi/source.wxs.erb
@@ -92,21 +92,15 @@
<Custom Action="FastUnzip" After="InstallFiles">NOT Installed</Custom>
<Custom Action="Cleanup" After="RemoveFiles">REMOVE~="ALL"</Custom>
<Custom Action="CreateChefClientScheduledTask" After="InstallFiles">
- <Condition>
- <![CDATA[(NOT Installed) AND &ChefSchTaskFeature=3]]>
- </Condition>
+ <![CDATA[(NOT Installed) AND &ChefSchTaskFeature=3]]>
</Custom>
<Custom Action="RemoveChefClientScheduledTask" Before="RemoveFiles">
- <Condition>
- <![CDATA[Installed AND (&None=3 OR &ChefServiceFeature=3)]]>
- </Condition>
+ <![CDATA[Installed AND (&None=3 OR &ChefServiceFeature=3)]]>
</Custom>
<Custom Action="RemoveChefClientService" Before="RemoveFiles">
- <Condition>
- <![CDATA[Installed AND (&None=3 OR &ChefSchTaskFeature=3)]]>
- </Condition>
+ <![CDATA[Installed AND (&None=3 OR &ChefSchTaskFeature=3)]]>
</Custom>
</InstallExecuteSequence>