Преглед изворни кода

adjust appimage launcher script to comply with appdir built during CI

fixes #1806
Sebastian Stenzel пре 3 година
родитељ
комит
d07c018670

+ 2 - 1
.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'`

+ 5 - 2
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