almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-05-04 20:51:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge dba66056ed into c99c424f87

Browse source
This commit is contained in:
Alex Pyrgiotis 2025-04-08 17:14:27 +03:00 committed by GitHub
commit f5751e41fd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
install/windows/build-wxs.py
View file

@ -193,7 +193,7 @@ def main():
Path="C:\\Program Files (x86)\\Dangerzone", Path="C:\\Program Files (x86)\\Dangerzone",
) )
ET.SubElement(directory_search_el, "FileSearch", Name="dangerzone.exe") ET.SubElement(directory_search_el, "FileSearch", Name="dangerzone.exe")
registry_search_el = ET.SubElement(package_el, "Property", Id="DANGERZONE080FOUND") registry_search_el = ET.SubElement(package_el, "Property", Id="DANGERZONE08FOUND")
ET.SubElement( ET.SubElement(
registry_search_el, registry_search_el,
"RegistrySearch", "RegistrySearch",
@ -202,11 +202,19 @@ def main():
Name="DisplayName", Name="DisplayName",
Type="raw", Type="raw",
) )
ET.SubElement(
registry_search_el,
"RegistrySearch",
Root="HKLM",
Key="SOFTWARE\\WOW6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{8AAC0808-3556-4164-9D15-6EC1FB673AB2}",
Name="DisplayName",
Type="raw",
)
ET.SubElement( ET.SubElement(
package_el, package_el,
"Launch", "Launch",
Condition="NOT OLDDANGERZONEFOUND AND NOT DANGERZONE080FOUND", Condition="NOT OLDDANGERZONEFOUND AND NOT DANGERZONE08FOUND",
Message="A previous version of [ProductName] is already installed. Please uninstall it from Programs and Features before proceeding with the installation.", Message='A previous version of [ProductName] is already installed. Please uninstall it from "Apps & Features" before proceeding with the installation.',
) )
# Add the ProgramMenuFolder StandardDirectory # Add the ProgramMenuFolder StandardDirectory