From 0ac63e7aba05fab1f389b37e914cbf57e89fe64c Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 18 Feb 2026 11:26:42 +0100 Subject: [PATCH] Closes #4136 --- .github/workflows/appimage.yml | 1 - .github/workflows/mac-dmg-x64.yml | 1 - .github/workflows/mac-dmg.yml | 1 - .github/workflows/win-exe.yml | 1 - dist/linux/appimage/build.sh | 1 - dist/linux/debian/rules | 1 - dist/mac/dmg/build.sh | 1 - dist/win/build.ps1 | 1 - 8 files changed, 8 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index a1c57d91c..70bcdf2c4 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -124,7 +124,6 @@ jobs: --java-options "-Djava.net.useSystemProxies=true" --java-options "-Dcryptomator.adminConfigPath=\"/etc/cryptomator/config.properties\"" --java-options "-Dcryptomator.logDir=\"@{userhome}/.local/share/Cryptomator/logs\"" - --java-options "-Dcryptomator.pluginDir=\"@{userhome}/.local/share/Cryptomator/plugins\"" --java-options "-Dcryptomator.settingsPath=\"@{userhome}/.config/Cryptomator/settings.json:@{userhome}/.Cryptomator/settings.json\"" --java-options "-Dcryptomator.p12Path=\"@{userhome}/.config/Cryptomator/key.p12\"" --java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/.config/Cryptomator/ipc.socket\"" diff --git a/.github/workflows/mac-dmg-x64.yml b/.github/workflows/mac-dmg-x64.yml index d8047462e..ef3b5da9f 100644 --- a/.github/workflows/mac-dmg-x64.yml +++ b/.github/workflows/mac-dmg-x64.yml @@ -130,7 +130,6 @@ jobs: --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\"" --java-options "-Dcryptomator.adminConfigPath=\"/Library/Application Support/Cryptomator/config.properties\"" --java-options "-Dcryptomator.logDir=\"@{userhome}/Library/Logs/Cryptomator\"" - --java-options "-Dcryptomator.pluginDir=\"@{userhome}/Library/Application Support/Cryptomator/Plugins\"" --java-options "-Dcryptomator.settingsPath=\"@{userhome}/Library/Application Support/Cryptomator/settings.json\"" --java-options "-Dcryptomator.p12Path=\"@{userhome}/Library/Application Support/Cryptomator/key.p12\"" --java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/Library/Application Support/Cryptomator/ipc.socket\"" diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 9a06024a0..6a3e99d2a 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -128,7 +128,6 @@ jobs: --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\"" --java-options "-Dcryptomator.adminConfigPath=\"/Library/Application Support/Cryptomator/config.properties\"" --java-options "-Dcryptomator.logDir=\"@{userhome}/Library/Logs/Cryptomator\"" - --java-options "-Dcryptomator.pluginDir=\"@{userhome}/Library/Application Support/Cryptomator/Plugins\"" --java-options "-Dcryptomator.settingsPath=\"@{userhome}/Library/Application Support/Cryptomator/settings.json\"" --java-options "-Dcryptomator.p12Path=\"@{userhome}/Library/Application Support/Cryptomator/key.p12\"" --java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/Library/Application Support/Cryptomator/ipc.socket\"" diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 23846ad5d..12ef4ab5e 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -142,7 +142,6 @@ jobs: --java-options "-Djava.net.useSystemProxies=true" --java-options "-Dcryptomator.adminConfigPath=\"C:/ProgramData/Cryptomator/config.properties\"" --java-options "-Dcryptomator.logDir=\"@{localappdata}/Cryptomator\"" - --java-options "-Dcryptomator.pluginDir=\"@{appdata}/Cryptomator/Plugins\"" --java-options "-Dcryptomator.settingsPath=\"@{appdata}/Cryptomator/settings.json;@{userhome}/AppData/Roaming/Cryptomator/settings.json\"" --java-options "-Dcryptomator.p12Path=\"@{appdata}/Cryptomator/key.p12;@{userhome}/AppData/Roaming/Cryptomator/key.p12\"" --java-options "-Dcryptomator.ipcSocketPath=\"@{localappdata}/Cryptomator/ipc.socket\"" diff --git a/dist/linux/appimage/build.sh b/dist/linux/appimage/build.sh index ee72b538b..7ceb98861 100755 --- a/dist/linux/appimage/build.sh +++ b/dist/linux/appimage/build.sh @@ -90,7 +90,6 @@ ${JAVA_HOME}/bin/jpackage \ --java-options "-Djava.net.useSystemProxies=true" \ --java-options "-Dcryptomator.adminConfigPath=\"/etc/cryptomator/config.properties\"" \ --java-options "-Dcryptomator.logDir=\"@{userhome}/.local/share/Cryptomator/logs\"" \ - --java-options "-Dcryptomator.pluginDir=\"@{userhome}/.local/share/Cryptomator/plugins\"" \ --java-options "-Dcryptomator.settingsPath=\"@{userhome}/.config/Cryptomator/settings.json:@{userhome}/.Cryptomator/settings.json\"" \ --java-options "-Dcryptomator.p12Path=\"@{userhome}/.config/Cryptomator/key.p12\"" \ --java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/.config/Cryptomator/ipc.socket\"" \ diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index 0d2242f40..fef465b65 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -53,7 +53,6 @@ override_dh_auto_build: --java-options "-Djava.net.useSystemProxies=true" \ --java-options "-Dcryptomator.adminConfigPath=\"/etc/cryptomator/config.properties\"" \ --java-options "-Dcryptomator.logDir=\"@{userhome}/.local/share/Cryptomator/logs\"" \ - --java-options "-Dcryptomator.pluginDir=\"@{userhome}/.local/share/Cryptomator/plugins\"" \ --java-options "-Dcryptomator.settingsPath=\"@{userhome}/.config/Cryptomator/settings.json:@{userhome}/.Cryptomator/settings.json\"" \ --java-options "-Dcryptomator.p12Path=\"@{userhome}/.config/Cryptomator/key.p12\"" \ --java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/.config/Cryptomator/ipc.socket\"" \ diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh index 438de7b9a..08620797a 100755 --- a/dist/mac/dmg/build.sh +++ b/dist/mac/dmg/build.sh @@ -117,7 +117,6 @@ ${JAVA_HOME}/bin/jpackage \ --java-options "-Dcryptomator.adminConfigPath=\"/Library/Application Support/Cryptomator/config.properties\"" \ --java-options "-Dcryptomator.logDir=\"@{userhome}/Library/Logs/${APP_NAME}\"" \ --java-options "-XX:ErrorFile=/cryptomator/cryptomator_crash.log" \ - --java-options "-Dcryptomator.pluginDir=\"@{userhome}/Library/Application Support/${APP_NAME}/Plugins\"" \ --java-options "-Dcryptomator.settingsPath=\"@{userhome}/Library/Application Support/${APP_NAME}/settings.json\"" \ --java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/Library/Application Support/${APP_NAME}/ipc.socket\"" \ --java-options "-Dcryptomator.p12Path=\"@{userhome}/Library/Application Support/${APP_NAME}/key.p12\"" \ diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index 54ee8946e..a2fe38a92 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -156,7 +156,6 @@ $javaOptions = @( "--java-options", "-Dcryptomator.logDir=`"@{localappdata}/$AppName`"" "--java-options", "-XX:ErrorFile=`"C:/cryptomator/cryptomator_crash.log`"" "--java-options", "-Dcryptomator.adminConfigPath=`"C:/ProgramData/$AppName/config.properties`"" -"--java-options", "-Dcryptomator.pluginDir=`"@{appdata}/$AppName/Plugins`"" "--java-options", "-Dcryptomator.settingsPath=`"@{appdata}/$AppName/settings.json;@{userhome}/AppData/Roaming/$AppName/settings.json`"" "--java-options", "-Dcryptomator.ipcSocketPath=`"@{localappdata}/$AppName/ipc.socket`"" "--java-options", "-Dcryptomator.p12Path=`"@{appdata}/$AppName/key.p12;@{userhome}/AppData/Roaming/$AppName/key.p12`""