Merge 6acc487a84 into 6cd706af10

windows: Minor change to uninstallation message
Refs #1026
2025-05-04 12:41:50 +02:00 · 2025-04-09 16:28:52 +03:00 · 2025-04-09 14:26:45 +02:00 · 2025-04-09 14:26:44 +02:00
1 changed files with 11 additions and 3 deletions
--- a/install/windows/build-wxs.py
+++ b/install/windows/build-wxs.py
@ -193,7 +193,7 @@ def main():
        Path="C:\\Program Files (x86)\\Dangerzone",
    )
    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(
        registry_search_el,
        "RegistrySearch",
@ -202,11 +202,19 @@ def main():
        Name="DisplayName",
        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(
        package_el,
        "Launch",
-        Condition="NOT OLDDANGERZONEFOUND AND NOT DANGERZONE080FOUND",
-        Message="A previous version of [ProductName] is already installed. Please uninstall it from Programs and Features before proceeding with the installation.",
+        Condition="NOT OLDDANGERZONEFOUND AND NOT DANGERZONE08FOUND",
+        Message='A previous version of [ProductName] is already installed. Please uninstall it from "Apps & Features" before proceeding with the installation.',
    )

    # Add the ProgramMenuFolder StandardDirectory
Author	SHA1	Message	Date
Alexis Métaireau	b026247993	Merge `6acc487a84` into `6cd706af10`	2025-04-09 16:28:52 +03:00
Alex Pyrgiotis	6cd706af10	windows: Minor change to uninstallation message Some checks are pending Tests / Download and cache Tesseract data (push) Waiting to run Details Tests / windows (push) Blocked by required conditions Details Tests / macOS (arch64) (push) Blocked by required conditions Details Tests / macOS (x86_64) (push) Blocked by required conditions Details Tests / build-deb (debian bookworm) (push) Blocked by required conditions Details Tests / build-deb (debian bullseye) (push) Blocked by required conditions Details Tests / build-deb (debian trixie) (push) Blocked by required conditions Details Tests / build-deb (ubuntu 24.04) (push) Blocked by required conditions Details Tests / build-deb (ubuntu 24.10) (push) Blocked by required conditions Details Tests / build-deb (ubuntu 25.04) (push) Blocked by required conditions Details Tests / install-deb (debian bookworm) (push) Blocked by required conditions Details Tests / build-install-rpm (fedora 42) (push) Blocked by required conditions Details Tests / run tests (debian bookworm) (push) Blocked by required conditions Details Tests / install-deb (debian bullseye) (push) Blocked by required conditions Details Tests / install-deb (debian trixie) (push) Blocked by required conditions Details Tests / install-deb (ubuntu 22.04) (push) Blocked by required conditions Details Tests / install-deb (ubuntu 24.04) (push) Blocked by required conditions Details Tests / run tests (debian bullseye) (push) Blocked by required conditions Details Tests / install-deb (ubuntu 24.10) (push) Blocked by required conditions Details Tests / install-deb (ubuntu 25.04) (push) Blocked by required conditions Details Tests / build-install-rpm (fedora 40) (push) Blocked by required conditions Details Tests / build-install-rpm (fedora 41) (push) Blocked by required conditions Details Tests / run tests (debian trixie) (push) Blocked by required conditions Details Tests / run tests (fedora 40) (push) Blocked by required conditions Details Tests / run tests (fedora 41) (push) Blocked by required conditions Details Release multi-arch container image / build-push-image (push) Waiting to run Details Scan latest app and container / security-scan-container (ubuntu-24.04) (push) Waiting to run Details Scan latest app and container / security-scan-container (ubuntu-24.04-arm) (push) Waiting to run Details Scan latest app and container / security-scan-app (ubuntu-24.04) (push) Waiting to run Details Scan latest app and container / security-scan-app (ubuntu-24.04-arm) (push) Waiting to run Details Refs #1026	2025-04-09 14:26:45 +02:00
Alex Pyrgiotis	634b171b97	windows: Detect Dangerzone 0.8.1 during install Detect Dangerzone 0.8.1 versions during install, so that we can prompt users to manually uninstall it. Refs #929	2025-04-09 14:26:44 +02:00