Skip to content

Commit

Permalink
Import source.wxs.erb changes from auditor repo
Browse files Browse the repository at this point in the history
This ensures we properly fix anything that upstream might have changed. Don't
copy the image resources into this repo however.
  • Loading branch information
ramereth committed May 12, 2021
1 parent 19d71cf commit b531c42
Show file tree
Hide file tree
Showing 12 changed files with 5 additions and 5 deletions.
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
-->
<% if fastmsi %>
<SetProperty Id="FastUnzip"
Value="FASTZIPDIR=[INSTALLLOCATION];FASTZIPAPPNAME=inspec"
Value="FASTZIPDIR=[INSTALLLOCATION];FASTZIPAPPNAME=cinc-auditor"
Sequence="execute"
Before="FastUnzip" />

Expand All @@ -53,7 +53,7 @@

<CustomAction Id="Cleanup"
Directory="INSTALLLOCATION"
ExeCommand="cmd /C &quot;rd /S /Q inspec&quot;"
ExeCommand="cmd /C &quot;rd /S /Q cinc-auditor&quot;"
Execute="deferred"
Impersonate="no"
Return="ignore" />
Expand All @@ -73,8 +73,8 @@

<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="WindowsVolume">
<Directory Id="INSTALLLOCATION" Name="opscode">
<Directory Id="PROJECTLOCATION" Name="inspec">
<Directory Id="INSTALLLOCATION" Name="cinc-project">
<Directory Id="PROJECTLOCATION" Name="cinc-auditor">
<Directory Id="PROJECTLOCATIONBIN" Name="bin">
<Component Id="InspecPath" Guid="{6169A1CB-D9E8-4C7b-ABB8-B6303A9A319A}" >
<Environment Id="Environment"
Expand All @@ -99,7 +99,7 @@
<Icon Id="inspec32.ico" SourceFile="Resources\assets\inspec_32x32.ico"/>
<Icon Id="inspec.ico" SourceFile="Resources\assets\inspec.ico"/>
<Property Id="ARPPRODUCTICON" Value="inspec16.ico" />
<Property Id="ARPHELPLINK" Value="http://www.getchef.com/support/" />
<Property Id="ARPHELPLINK" Value="https://www.cinc.sh/" />
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" />

<UIRef Id="InspecUI_InstallDir"/>
Expand Down

0 comments on commit b531c42

Please sign in to comment.