diff --git a/dist/linux/appimage/build.sh b/dist/linux/appimage/build.sh index 9fdac661a..1d0017ea4 100755 --- a/dist/linux/appimage/build.sh +++ b/dist/linux/appimage/build.sh @@ -8,8 +8,11 @@ if [ -z "${JAVA_HOME}" ]; then echo "JAVA_HOME not set. Run using JAVA_HOME=/pat command -v mvn >/dev/null 2>&1 || { echo >&2 "mvn not found."; exit 1; } command -v curl >/dev/null 2>&1 || { echo >&2 "curl not found."; exit 1; } +VERSION=$(mvn -f ../../../pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout) + # compile -mvn -B -f../../pom.xml clean package -DskipTests -Plinux +mvn -B -f ../../../pom.xml clean package -DskipTests -Plinux +cp ../../../target/cryptomator-*.jar ../../../target/mods # add runtime ${JAVA_HOME}/bin/jlink \ @@ -26,8 +29,8 @@ ${JAVA_HOME}/bin/jpackage \ --verbose \ --type app-image \ --runtime-image runtime \ - --input buildkit/libs \ - --module-path buildkit/mods \ + --input ../../../target/libs \ + --module-path ../../../target/mods \ --module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator \ --dest . \ --name Cryptomator \ @@ -35,19 +38,19 @@ ${JAVA_HOME}/bin/jpackage \ --copyright "(C) 2016 - 2021 Skymatic GmbH" \ --java-options "-Xss5m" \ --java-options "-Xmx256m" \ - --app-version "${{ needs.metadata.outputs.versionNum }}.${{ needs.metadata.outputs.revNum }}" \ + --app-version "${VERSION}.${REVISION_NO}" \ --java-options "-Dfile.encoding=\"utf-8\"" \ --java-options "-Dcryptomator.logDir=\"~/.local/share/Cryptomator/logs\"" \ --java-options "-Dcryptomator.settingsPath=\"~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json\"" \ --java-options "-Dcryptomator.ipcSocketPath=\"~/.config/Cryptomator/ipc.socket\"" \ --java-options "-Dcryptomator.mountPointsDir=\"~/.local/share/Cryptomator/mnt\"" \ --java-options "-Dcryptomator.showTrayIcon=false" \ - --java-options "-Dcryptomator.buildNumber=\"appimage-${{ needs.metadata.outputs.revNum }}\"" \ + --java-options "-Dcryptomator.buildNumber=\"appimage-${REVISION_NO}\"" \ --resource-dir ../resources # transform AppDir mv Cryptomator Cryptomator.AppDir -cp -r dist/linux/appimage/resources/AppDir/* Cryptomator.AppDir/ +cp -r resources/AppDir/* Cryptomator.AppDir/ chmod +x Cryptomator.AppDir/lib/runtime/bin/java envsubst '${REVISION_NO}' < 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 @@ -70,4 +73,4 @@ chmod +x /tmp/appimagetool.AppImage /tmp/appimagetool.AppImage \ Cryptomator.AppDir \ cryptomator-SNAPSHOT-x86_64.AppImage \ - -u 'gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-x86_64.AppImage.zsync' \ No newline at end of file + -u 'gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-x86_64.AppImage.zsync'