From b4418034626a0c4e44f3483de271770bb61b2c05 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 14 Jan 2026 16:28:48 +0100 Subject: [PATCH] also adjust wix installer to new config format --- dist/common/config.json | 3 +++ dist/common/config.properties | 13 ------------- dist/win/resources/main.wxs | 12 ++++++------ 3 files changed, 9 insertions(+), 19 deletions(-) create mode 100644 dist/common/config.json delete mode 100644 dist/common/config.properties diff --git a/dist/common/config.json b/dist/common/config.json new file mode 100644 index 000000000..d077d240e --- /dev/null +++ b/dist/common/config.json @@ -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." +} \ No newline at end of file diff --git a/dist/common/config.properties b/dist/common/config.properties deleted file mode 100644 index 6ad5dfd90..000000000 --- a/dist/common/config.properties +++ /dev/null @@ -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 \ No newline at end of file diff --git a/dist/win/resources/main.wxs b/dist/win/resources/main.wxs index 01f399b77..143e5a1a2 100644 --- a/dist/win/resources/main.wxs +++ b/dist/win/resources/main.wxs @@ -101,7 +101,7 @@ - + - - + + @@ -132,9 +132,9 @@ - - - + + +