mirror of
https://github.com/freedomofpress/dangerzone.git
synced 2025-05-05 13:11:49 +02:00
Compare commits
3 commits
3a6b99cb24
...
74187f624e
Author | SHA1 | Date | |
---|---|---|---|
![]() |
74187f624e | ||
![]() |
2706080bc8 | ||
![]() |
20354e7c11 |
2 changed files with 36 additions and 1 deletions
2
.github/workflows/scan_released.yml
vendored
2
.github/workflows/scan_released.yml
vendored
|
@ -19,7 +19,7 @@ jobs:
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Download container image for the latest release and load it
|
- name: Download container image for the latest release and load it
|
||||||
run: |
|
run: |
|
||||||
VERSION=$(curl https://api.github.com/repos/freedomofpress/dangerzone/releases/latest | jq -r '.tag_name')
|
VERSION=$(curl https://api.github.com/repos/freedomofpress/dangerzone/releases/latest | grep "tag_name" | cut -d '"' -f 4)
|
||||||
CONTAINER_FILENAME=container-${VERSION:1}-${{ matrix.arch }}.tar.gz
|
CONTAINER_FILENAME=container-${VERSION:1}-${{ matrix.arch }}.tar.gz
|
||||||
wget https://github.com/freedomofpress/dangerzone/releases/download/${VERSION}/${CONTAINER_FILENAME} -O ${CONTAINER_FILENAME}
|
wget https://github.com/freedomofpress/dangerzone/releases/download/${VERSION}/${CONTAINER_FILENAME} -O ${CONTAINER_FILENAME}
|
||||||
docker load -i ${CONTAINER_FILENAME}
|
docker load -i ${CONTAINER_FILENAME}
|
||||||
|
|
|
@ -177,6 +177,41 @@ def main():
|
||||||
)
|
)
|
||||||
ET.SubElement(ui_el, "UIRef", Id="WixUI_ErrorProgressText")
|
ET.SubElement(ui_el, "UIRef", Id="WixUI_ErrorProgressText")
|
||||||
|
|
||||||
|
# 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
|
||||||
|
#
|
||||||
|
# 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,
|
||||||
|
"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,
|
||||||
|
"RegistrySearch",
|
||||||
|
Root="HKLM",
|
||||||
|
Key="SOFTWARE\\WOW6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{03C2D2B2-9955-4AED-831F-DA4E67FC0FDB}",
|
||||||
|
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.",
|
||||||
|
)
|
||||||
|
|
||||||
# Add the ProgramMenuFolder StandardDirectory
|
# Add the ProgramMenuFolder StandardDirectory
|
||||||
programmenufolder_el = ET.SubElement(
|
programmenufolder_el = ET.SubElement(
|
||||||
package_el,
|
package_el,
|
||||||
|
|
Loading…
Reference in a new issue