Skip to content

Commit e18cc13

Browse files
Remove gamepad custom actions from installer
Remove CA_GamepadInstall and CA_GamepadUninstall custom actions from the WiX installer and update the InstallExecuteSequence accordingly. ServiceInstall is now run after FirewallAdd, and RestoreNvPrefs now runs after ServiceUninstall. This removes the PowerShell-based gamepad install/uninstall steps and fixes the action ordering to avoid references to the removed actions.
1 parent 9f9e761 commit e18cc13

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

cmake/packaging/wix_resources/sunshine-installer.wxs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
<CustomAction Id="CA_MigrateConfig" Directory="INSTALL_ROOT" ExeCommand="&quot;[SystemFolder]cmd.exe&quot; /c &quot;[INSTALL_ROOT]scripts\migrate-config.bat&quot;" Execute="deferred" Return="ignore" Impersonate="no" />
2222
<CustomAction Id="CA_FirewallAdd" Directory="INSTALL_ROOT" ExeCommand="&quot;[SystemFolder]cmd.exe&quot; /c &quot;[INSTALL_ROOT]scripts\add-firewall-rule.bat&quot;" Execute="deferred" Return="ignore" Impersonate="no" />
2323
<CustomAction Id="CA_FirewallRemove" Directory="INSTALL_ROOT" ExeCommand="&quot;[SystemFolder]cmd.exe&quot; /c &quot;[INSTALL_ROOT]scripts\delete-firewall-rule.bat&quot;" Execute="deferred" Return="ignore" Impersonate="no" />
24-
<CustomAction Id="CA_GamepadInstall" Directory="INSTALL_ROOT" ExeCommand="&quot;[SystemFolder]WindowsPowerShell\v1.0\powershell.exe&quot; -NoProfile -ExecutionPolicy Bypass -File &quot;[INSTALL_ROOT]scripts\install-gamepad.ps1&quot;" Execute="deferred" Return="ignore" Impersonate="no" />
25-
<CustomAction Id="CA_GamepadUninstall" Directory="INSTALL_ROOT" ExeCommand="&quot;[SystemFolder]WindowsPowerShell\v1.0\powershell.exe&quot; -NoProfile -ExecutionPolicy Bypass -File &quot;[INSTALL_ROOT]scripts\uninstall-gamepad.ps1&quot;" Execute="deferred" Return="ignore" Impersonate="no" />
2624
<CustomAction Id="CA_ServiceInstall" Directory="INSTALL_ROOT" ExeCommand="&quot;[SystemFolder]cmd.exe&quot; /c &quot;[INSTALL_ROOT]scripts\install-service.bat&quot;" Execute="deferred" Return="ignore" Impersonate="no" />
2725
<CustomAction Id="CA_ServiceAutostart" Directory="INSTALL_ROOT" ExeCommand="&quot;[SystemFolder]cmd.exe&quot; /c &quot;[INSTALL_ROOT]scripts\autostart-service.bat&quot;" Execute="deferred" Return="ignore" Impersonate="no" />
2826
<CustomAction Id="CA_ServiceUninstall" Directory="INSTALL_ROOT" ExeCommand="&quot;[SystemFolder]cmd.exe&quot; /c &quot;[INSTALL_ROOT]scripts\uninstall-service.bat&quot;" Execute="deferred" Return="ignore" Impersonate="no" />
@@ -33,14 +31,12 @@
3331
<Custom Action="CA_UpdatePathAdd" After="CA_ResetPermissions" Condition="NOT Installed" />
3432
<Custom Action="CA_MigrateConfig" After="CA_UpdatePathAdd" Condition="NOT Installed" />
3533
<Custom Action="CA_FirewallAdd" After="CA_MigrateConfig" Condition="NOT Installed" />
36-
<Custom Action="CA_GamepadInstall" After="CA_FirewallAdd" Condition="NOT Installed" />
37-
<Custom Action="CA_ServiceInstall" After="CA_GamepadInstall" Condition="NOT Installed" />
34+
<Custom Action="CA_ServiceInstall" After="CA_FirewallAdd" Condition="NOT Installed" />
3835
<Custom Action="CA_ServiceAutostart" After="CA_ServiceInstall" Condition="NOT Installed" />
3936

4037
<Custom Action="CA_FirewallRemove" Before="RemoveFiles" Condition="REMOVE=&quot;ALL&quot;" />
4138
<Custom Action="CA_ServiceUninstall" Before="CA_FirewallRemove" Condition="REMOVE=&quot;ALL&quot;" />
42-
<Custom Action="CA_GamepadUninstall" After="CA_ServiceUninstall" Condition="REMOVE=&quot;ALL&quot;" />
43-
<Custom Action="CA_RestoreNvPrefs" After="CA_GamepadUninstall" Condition="REMOVE=&quot;ALL&quot;" />
39+
<Custom Action="CA_RestoreNvPrefs" After="CA_ServiceUninstall" Condition="REMOVE=&quot;ALL&quot;" />
4440
<Custom Action="CA_UpdatePathRemove" After="CA_RestoreNvPrefs" Condition="REMOVE=&quot;ALL&quot;" />
4541
</InstallExecuteSequence>
4642

0 commit comments

Comments
 (0)