mirror of
https://github.com/freedomofpress/dangerzone.git
synced 2025-05-03 20:21:49 +02:00
Compare commits
2 commits
7e4346a306
...
223fb0f1b9
Author | SHA1 | Date | |
---|---|---|---|
![]() |
223fb0f1b9 | ||
![]() |
8603cd3b86 |
1 changed files with 43 additions and 2 deletions
|
@ -155,10 +155,51 @@ def main():
|
||||||
Id="ARPURLINFOABOUT",
|
Id="ARPURLINFOABOUT",
|
||||||
Value="https://freedom.press",
|
Value="https://freedom.press",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
ui_el = ET.SubElement(package_el, "UI")
|
||||||
|
|
||||||
ET.SubElement(
|
ET.SubElement(
|
||||||
package_el, "ui:WixUI", Id="WixUI_InstallDir", InstallDirectory="INSTALLFOLDER"
|
ui_el, "ui:WixUI", Id="WixUI_InstallDir", InstallDirectory="INSTALLFOLDER"
|
||||||
)
|
)
|
||||||
ET.SubElement(package_el, "UIRef", Id="WixUI_ErrorProgressText")
|
ET.SubElement(ui_el, "UIRef", Id="WixUI_ErrorProgressText")
|
||||||
|
|
||||||
|
# Workaround for an issue after upgrading from WiX Toolset 3 to 5 where the older
|
||||||
|
# version of Dangerzone is not uninstalled during the upgrade
|
||||||
|
#
|
||||||
|
# Work around the issue by adding some extra functionality to the "Next" button on the welcome screen
|
||||||
|
# of the installer. When the user clicks it to proceed with the installation this:
|
||||||
|
# 1. Flips the install scope to "perUser" which is the default in WiX 3
|
||||||
|
# 2. Finds the older installation
|
||||||
|
# 3. And finally flips the scope back to "perMachine" which is the default in WiX 4 and newer
|
||||||
|
#
|
||||||
|
# Adapted from this stack overflow answer: https://stackoverflow.com/a/35064434
|
||||||
|
#
|
||||||
|
# TODO: Revert this once we are reasonably certain there are no affected Dangerzone Installations?
|
||||||
|
ET.SubElement(
|
||||||
|
ui_el,
|
||||||
|
"Publish",
|
||||||
|
Dialog="WelcomeDlg",
|
||||||
|
Control="Next",
|
||||||
|
Property="ALLUSERS",
|
||||||
|
Value="{}",
|
||||||
|
)
|
||||||
|
ET.SubElement(
|
||||||
|
ui_el,
|
||||||
|
"Publish",
|
||||||
|
Dialog="WelcomeDlg",
|
||||||
|
Control="Next",
|
||||||
|
Event="DoAction",
|
||||||
|
Value="FindRelatedProducts",
|
||||||
|
)
|
||||||
|
ET.SubElement(
|
||||||
|
ui_el,
|
||||||
|
"Publish",
|
||||||
|
Dialog="WelcomeDlg",
|
||||||
|
Control="Next",
|
||||||
|
Property="ALLUSERS",
|
||||||
|
Value="1",
|
||||||
|
)
|
||||||
|
|
||||||
ET.SubElement(
|
ET.SubElement(
|
||||||
package_el,
|
package_el,
|
||||||
"WixVariable",
|
"WixVariable",
|
||||||
|
|
Loading…
Reference in a new issue