mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-21 12:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

also adjust wix installer to new config format

Browse Source
This commit is contained in:
Armin Schrenk
2026-01-14 16:28:48 +01:00
parent 42b06aa556
commit b441803462
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dist/common/config.json vendored Normal file
View File

@@ -0,0 +1,3 @@
{
"ignored": "This is the Cryptomator administrative configuration file. For more info, read the docs at https:\\docs.cryptomator.org. This entry can be removed."
}

13
dist/common/config.properties vendored
View File

@@ -1,13 +0,0 @@
# This is the Cryptomator administrative configuration file.
# It is a simple key-value pair file.
# Lines starting with '#' are comments and will be ignored.
#
# There are some shorthands for well known folders:
# Substitution Key | Variable Value
# @{appdir} | The application installation directory.
# @{appdata} | %APPDATA% (Windows only).
# @{localappdata} | %LOCALAPPDATA% (Windows only).
# @{userhome} | The user's home directory.
#
# Example:
# cryptomator.pluginDir=@{appdata}/Cryptomator/Plugins #Sets a plugin directory and enables plugin loading

12
dist/win/resources/main.wxs vendored
View File

@@ -101,7 +101,7 @@
<ns0:StandardDirectory Id="CommonAppDataFolder">
<ns0:Directory Id="CryptomatorDesktopProgramData" Name="Cryptomator">
<ns0:Component Id="AdminPropertiesDir" Guid="c078b7da-ba6e-4069-a5ab-5c0f0f9856a0">
<ns0:Component Id="AdminConfigDir" Guid="c078b7da-ba6e-4069-a5ab-5c0f0f9856a0">
<ns0:CreateFolder>
<util:PermissionEx
User="SYSTEM"
@@ -115,8 +115,8 @@
GenericExecute="yes"/>
</ns0:CreateFolder>
</ns0:Component>
<ns0:Component Id="AdminPropertiesFile" NeverOverwrite="yes" Permanent="yes">
<ns0:File Id="EmptyAdminConfig" Source="$(env.JP_WIXWIZARD_RESOURCES)\..\..\common\config.properties" Name="config.properties" KeyPath="yes">
<ns0:Component Id="AdminConfigFile" NeverOverwrite="yes" Permanent="yes">
<ns0:File Id="EmptyAdminConfig" Source="$(env.JP_WIXWIZARD_RESOURCES)\..\..\common\config.json" Name="config.json" KeyPath="yes">
<util:PermissionEx User="SYSTEM" GenericAll="yes"/>
<util:PermissionEx User="Administrators" GenericAll="yes"/>
<util:PermissionEx User="Users" GenericRead="yes" GenericExecute="yes"/>
@@ -132,9 +132,9 @@
<ns0:ComponentGroupRef Id="Files"/>
<ns0:ComponentGroupRef Id="FileAssociations"/>
<!-- Ref to additional ProgIDs -->
<ns0:ComponentRef Id="nonStartingProgID" />
<ns0:ComponentRef Id="AdminPropertiesDir" />
<ns0:ComponentRef Id="AdminPropertiesFile" />
<ns0:ComponentRef Id="nonStartingProgID"/>
<ns0:ComponentRef Id="AdminConfigDir"/>
<ns0:ComponentRef Id="AdminConfigFile"/>
</ns0:Feature>
<ns0:CustomAction Id="JpSetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />