Merge d55fa8e87c into d722800a4b

Workaround for an issue after upgrading from WiX Toolset v3 to v5 where the previous
version of Dangerzone is not uninstalled during the upgrade by checking if the older installation
exists in "C:\Program Files (x86)\Dangerzone".

Also handle a special case for Dangerzone 0.8.0 which allows choosing the install location
during install by checking if the registry key for it exists.

Note that this seems to allow installing Dangerzone 0.8.0 after installing Dangerzone from this branch.
In this case the installer errors until Dangerzone 0.8.0 is uninstalled again

.github/workflows/scan_released.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Download container image for the latest release and load it
         run: |
-          VERSION=$(curl https://api.github.com/repos/freedomofpress/dangerzone/releases/latest | grep "tag_name" | cut -d '"' -f 4)
+          VERSION=$(curl https://api.github.com/repos/freedomofpress/dangerzone/releases/latest | jq -r '.tag_name')
           CONTAINER_FILENAME=container-${VERSION:1}-${{ matrix.arch }}.tar.gz
           wget https://github.com/freedomofpress/dangerzone/releases/download/${VERSION}/${CONTAINER_FILENAME} -O ${CONTAINER_FILENAME}
           docker load -i ${CONTAINER_FILENAME}

install/windows/build-wxs.py

@@ -188,14 +188,13 @@ def main():
     # In this case the installer errors until Dangerzone 0.8.0 is uninstalled again
     #
     # TODO: Revert this once we are reasonably certain there aren't too many affected Dangerzone installations.
-    find_old_el = ET.SubElement(package_el, "Property", Id="OLDDANGERZONEFOUND")
-    directory_search_el = ET.SubElement(
-        find_old_el,
+    property_el = ET.SubElement(package_el, "Property", Id="OLDDANGERZONEFOUND")
+    dir_search_el = ET.SubElement(
+        property_el,
         "DirectorySearch",
         Id="dangerzone_install_folder",
         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")
     ET.SubElement(
         registry_search_el,
@@ -205,6 +204,7 @@ def main():
         Name="DisplayName",
         Type="raw",
     )
+    ET.SubElement(dir_search_el, "FileSearch", Name="dangerzone.exe")
     ET.SubElement(
         package_el,
         "Launch",