yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-04-29 14:45:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed LaunchApplication CustomAction duplication RIVM-6

Browse source
This commit is contained in:
vadym 2022-11-30 22:15:09 +02:00
parent cb872eb590
commit da0e9900a7
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
contrib/msi/build-msi-gui.sh
View file

@ -297,12 +297,6 @@ cat > wix.xml << EOF
Impersonate="yes" /> Impersonate="yes" />
<!-- Step 2: Add UI to your installer / Step 4: Trigger the custom action --> <!-- Step 2: Add UI to your installer / Step 4: Trigger the custom action -->
<CustomAction Id="LaunchApplication"
FileKey="MeshUI"
ExeCommand="[MeshInstallFolder]mesh-ui.exe ui\index.html"
Execute="immediate"
Impersonate="yes"
Return="asyncNoWait" />
<UI> <UI>
<UIRef Id="WixUI_Minimal" /> <UIRef Id="WixUI_Minimal" />
<Publish Dialog="ExitDialog" <Publish Dialog="ExitDialog"
@ -310,17 +304,19 @@ cat > wix.xml << EOF
Event="DoAction" Event="DoAction"
Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish> Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
</UI> </UI>
<CustomAction Id="LaunchApplication"
ExeCommand="[MeshInstallFolder]mesh-ui.exe ui\index.html"
Execute="immediate"
BinaryKey="WixCA"
DllEntry="WixShellExec"
Impersonate="yes"
Return="asyncNoWait"/>
<WixVariable Id="WixUILicenseRtf" Value="${PKGLICENSEFILE}" /> <WixVariable Id="WixUILicenseRtf" Value="${PKGLICENSEFILE}" />
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch RiV-mesh" /> <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch RiV-mesh" />
<!-- Step 3: Include the custom action --> <!-- Step 3: Include the custom action -->
<Property Id="WixShellExecTarget" Value="[#MeshUI]" /> <Property Id="WixShellExecTarget" Value="[#MeshUI]" />
<Property Id="ASSISTANCE_START_VIA_REGISTRY">1</Property> <Property Id="ASSISTANCE_START_VIA_REGISTRY">1</Property>
<CustomAction Id="LaunchApplication"
BinaryKey="WixCA"
DllEntry="WixShellExec"
Impersonate="yes" />
<InstallExecuteSequence> <InstallExecuteSequence>
<Custom <Custom
Action="UpdateGenerateConfig" Action="UpdateGenerateConfig"