almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Change: Rename INSTALLDIR to INSTALLFOLDER

Browse source 
It's the new default name for it
This commit is contained in:
JKarasti 2024-09-23 20:21:48 +03:00 committed by Alex Pyrgiotis
parent f349e16523
commit 180b9442ab
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ def build_data(dirname, dir_prefix, id_, name):
if os.path.isfile(filename): if os.path.isfile(filename):
data["files"].append(os.path.join(dir_prefix, basename)) data["files"].append(os.path.join(dir_prefix, basename))
elif os.path.isdir(filename): elif os.path.isdir(filename):
if id_ == "INSTALLDIR": if id_ == "INSTALLFOLDER":
id_prefix = "Folder" id_prefix = "Folder"
else: else:
id_prefix = id_ id_prefix = id_
@ -42,7 +42,7 @@ def build_data(dirname, dir_prefix, id_, name):
) )
if len(data["files"]) > 0: if len(data["files"]) > 0:
if id_ == "INSTALLDIR": if id_ == "INSTALLFOLDER":
data["component_id"] = "ApplicationFiles" data["component_id"] = "ApplicationFiles"
else: else:
data["component_id"] = "FolderComponent" + id_[len("Folder") :] data["component_id"] = "FolderComponent" + id_[len("Folder") :]
@ -75,8 +75,8 @@ def build_dir_xml(root, data):
Id="ApplicationShortcut1", Id="ApplicationShortcut1",
Name="Dangerzone", Name="Dangerzone",
Description="Dangerzone", Description="Dangerzone",
Target="[INSTALLDIR]dangerzone.exe", Target="[INSTALLFOLDER]dangerzone.exe",
WorkingDirectory="INSTALLDIR", WorkingDirectory="INSTALLFOLDER",
) )
ET.SubElement( ET.SubElement(
component_el, component_el,
@ -153,7 +153,7 @@ def main():
build_data( build_data(
dist_dir, dist_dir,
"exe.win-amd64-3.12", "exe.win-amd64-3.12",
"INSTALLDIR", "INSTALLFOLDER",
"Dangerzone", "Dangerzone",
) )
) )
@ -204,7 +204,7 @@ def main():
product_el, product_el,
"Property", "Property",
Id="WIXUI_INSTALLDIR", Id="WIXUI_INSTALLDIR",
Value="INSTALLDIR", Value="INSTALLFOLDER",
) )
ET.SubElement(product_el, "UIRef", Id="WixUI_InstallDir") ET.SubElement(product_el, "UIRef", Id="WixUI_InstallDir")
ET.SubElement(product_el, "UIRef", Id="WixUI_ErrorProgressText") ET.SubElement(product_el, "UIRef", Id="WixUI_ErrorProgressText")