diff --git a/Quelea/launch.sh b/Quelea/launch.sh index dd467656a..e76d0df39 100644 --- a/Quelea/launch.sh +++ b/Quelea/launch.sh @@ -3,4 +3,4 @@ cd $SNAP/jar export GST_PLUGIN_PATH=$SNAP/usr/lib/x86_64-linux-gnu/gstreamer-1.0 export GST_PLUGIN_SCANNER=$SNAP/usr/lib/x86_64-linux-gnu/gstreamer-1.0/gst-plugin-scanner export G_FILENAME_ENCODING=UTF-8 -java --add-exports=javafx.graphics/com.sun.javafx.css=ALL-UNNAMED --add-exports=javafx.base/com.sun.javafx.runtime=ALL-UNNAMED --add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens javafx.controls/javafx.scene.control=ALL-UNNAMED -Djdk.gtk.verbose=true -Djdk.gtk.version=2 -DVLCJ_INITX=no -Duser.dir=$SNAP/jar -Dfile.encoding=UTF-8 -Dprism.dirtyopts=false -Djavafx.cachedir=$SNAP_USER_COMMON -jar $SNAP/jar/Quelea.jar --userhome=$SNAP_USER_COMMON \ No newline at end of file +jvm/bin/java --add-exports=javafx.graphics/com.sun.javafx.css=ALL-UNNAMED --add-exports=javafx.base/com.sun.javafx.runtime=ALL-UNNAMED --add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens javafx.controls/javafx.scene.control=ALL-UNNAMED -Djdk.gtk.verbose=true -Djdk.gtk.version=2 -DVLCJ_INITX=no -Duser.dir=$SNAP/jar -Dfile.encoding=UTF-8 -Dprism.dirtyopts=false -Djavafx.cachedir=$SNAP_USER_COMMON -jar $SNAP/jar/Quelea.jar --userhome=$SNAP_USER_COMMON \ No newline at end of file diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 927c1cf46..f926b7fc6 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -38,14 +38,14 @@ parts: gradle -Djava.net.useSystemProxies=true -Dnightly=true -Dversionsuffix=CI-UNSTABLE clean downloadJres jar downloadUbuntuJvm copyToDist override-stage: | snapcraftctl stage + mkdir $SNAPCRAFT_STAGE/jar/jvm cp -a /build/quelea/parts/quelea/build/dist/. $SNAPCRAFT_STAGE/jar + cp -a /build/quelea/parts/quelea/build/zulu17.48.15-ca-fx-jdk17.0.10-linux_x64/. $SNAPCRAFT_STAGE/jvm override-prime: | snapcraftctl prime mkdir $SNAPCRAFT_PRIME/jar cp -a $SNAPCRAFT_STAGE/jar/. $SNAPCRAFT_PRIME/jar/. chmod +x $SNAPCRAFT_PRIME/jar/launch.sh rm -rf $SNAPCRAFT_PRIME/jar/winjre64 - ls -l $SNAPCRAFT_PRIME - ls -l $SNAPCRAFT_PRIME/jar