From d07c0186700ebc4edf907218f7945ff3e9787576 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 23 Sep 2021 14:01:07 +0200 Subject: [PATCH] adjust appimage launcher script to comply with appdir built during CI fixes #1806 --- .github/workflows/release.yml | 3 ++- dist/linux/appimage/resources/AppDir/bin/cryptomator.sh | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dca01d819..d0874739c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -283,7 +283,7 @@ jobs: run: | mv appdir/Cryptomator Cryptomator.AppDir cp -r dist/linux/appimage/resources/AppDir/* Cryptomator.AppDir/ - envsubst '${REVISION_NO}' < dist/linux/appimage/resources/AppDir/bin/cryptomator.sh > Cryptomator.AppDir/bin/cryptomator.sh + envsubst '${REVISION_NO} ${SEMVER_STR}' < dist/linux/appimage/resources/AppDir/bin/cryptomator.sh > Cryptomator.AppDir/bin/cryptomator.sh ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/org.cryptomator.Cryptomator.svg ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/Cryptomator.svg ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/.DirIcon @@ -291,6 +291,7 @@ jobs: ln -s bin/cryptomator.sh Cryptomator.AppDir/AppRun env: REVISION_NO: ${{ needs.metadata.outputs.revNum }} + SEMVER_STR: ${{ needs.metadata.outputs.semVerStr }} - name: Extract libjffi.so # workaround for https://github.com/cryptomator/cryptomator-linux/issues/27 run: | JFFI_NATIVE_JAR=`ls lib/app/ | grep -e 'jffi-[1-9]\.[0-9]\{1,2\}.[0-9]\{1,2\}-native.jar'` diff --git a/dist/linux/appimage/resources/AppDir/bin/cryptomator.sh b/dist/linux/appimage/resources/AppDir/bin/cryptomator.sh index fa86a2c30..06cd8f110 100755 --- a/dist/linux/appimage/resources/AppDir/bin/cryptomator.sh +++ b/dist/linux/appimage/resources/AppDir/bin/cryptomator.sh @@ -26,12 +26,15 @@ export LD_PRELOAD=lib/app/libjffi.so ./lib/runtime/bin/java \ -p "lib/app/mods" \ -cp "lib/app/*" \ + -Dfile.encoding="utf-8" \ -Dcryptomator.logDir="~/.local/share/Cryptomator/logs" \ + -Dcryptomator.pluginDir="~/.local/share/Cryptomator/plugins" -Dcryptomator.mountPointsDir="~/.local/share/Cryptomator/mnt" \ -Dcryptomator.settingsPath="~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json" \ -Dcryptomator.ipcSocketPath="~/.config/Cryptomator/ipc.socket" \ -Dcryptomator.buildNumber="appimage-${REVISION_NO}" \ + -Dcryptomator.appVersion="${SEMVER_STR}" \ $GTK_FLAG \ - -Xss2m \ - -Xmx512m \ + -Xss5m \ + -Xmx256m \ -m org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator