Bläddra i källkod

updated standalone build.sh

[ci skip]
Sebastian Stenzel 4 år sedan
förälder
incheckning
8d17042456
2 ändrade filer med 16 tillägg och 13 borttagningar
  1. 4 0
      dist/appimage/.gitignore
  2. 12 13
      dist/appimage/build.sh

+ 4 - 0
dist/appimage/.gitignore

@@ -0,0 +1,4 @@
+# created during build
+Cryptomator.AppDir
+*.AppImage
+*.AppImage.zsync

+ 12 - 13
dist/appimage/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BASEDIR=$(dirname $0)/../..
+cd $(dirname $0)
 REVISION_NO=`git rev-list --count HEAD`
 
 # check preconditions
@@ -9,18 +9,17 @@ 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; }
 
 # compile
-mvn -B -f${BASEDIR}/pom.xml clean package -DskipTests -Plinux
+mvn -B -f../../pom.xml clean package -DskipTests -Plinux
 
 # prepare AppDir
-mkdir ${BASEDIR}/target/Cryptomator.AppDir
-mv ${BASEDIR}/target/libs ${BASEDIR}/target/Cryptomator.AppDir
-mv ${BASEDIR}/target/mods ${BASEDIR}/target/Cryptomator.AppDir
-mv ${BASEDIR}/LICENSE.txt ${BASEDIR}/target/Cryptomator.AppDir
-cd ${BASEDIR}/target/Cryptomator.AppDir
+mkdir Cryptomator.AppDir
+mv ../../target/libs Cryptomator.AppDir
+mv ../../target/mods Cryptomator.AppDir
+cp ../../LICENSE.txt Cryptomator.AppDir
 
 # add runtime
 ${JAVA_HOME}/bin/jlink
-          --output runtime
+          --output Cryptomator.AppDir/runtime
           --module-path "${JAVA_HOME}/jmods"
           --add-modules java.base,java.desktop,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility
           --no-header-files
@@ -29,13 +28,13 @@ ${JAVA_HOME}/bin/jlink
           --compress=1
 
 # extract jffi
-JFFI_NATIVE_JAR=`ls libs | grep -e 'jffi-[1-9]\.[0-9]\{1,2\}.[0-9]\{1,2\}-native.jar'`
-${JAVA_HOME}/bin/jar -xf libs/${JFFI_NATIVE_JAR} /jni/x86_64-Linux/
-mv jni/x86_64-Linux/* libs/libjffi.so
+JFFI_NATIVE_JAR=`ls Cryptomator.AppDir/libs | grep -e 'jffi-[1-9]\.[0-9]\{1,2\}.[0-9]\{1,2\}-native.jar'`
+${JAVA_HOME}/bin/jar -xf Cryptomator.AppDir/libs/${JFFI_NATIVE_JAR} /jni/x86_64-Linux/
+mv jni/x86_64-Linux/* Cryptomator.AppDir/libs/libjffi.so
 rm -r jni/x86_64-Linux
 
 # finalize AppDir
-envsubst '${REVISION_NO}' < ${BASEDIR}/dist/appimage/resources/AppDir/bin/cryptomator.sh > Cryptomator.AppDir/bin/cryptomator.sh
+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
 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
@@ -48,6 +47,6 @@ chmod +x /tmp/appimagetool.AppImage
 
 # create AppImage
 /tmp/appimagetool.AppImage \
-    ${BASEDIR}/target/Cryptomator.AppDir \
+    Cryptomator.AppDir \
     cryptomator-SNAPSHOT-x86_64.AppImage \
     -u 'gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-x86_64.AppImage.zsync'