The last commit worked - attempting cleanup

quelea-projection · Feb 7, 2024 · f4a8388 · f4a8388
1 parent ac7ed98
commit f4a8388
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/Quelea/launch.sh b/Quelea/launch.sh
@@ -3,6 +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
-export XDG_DATA_DIRS=/snap/quelea/current/usr/share/glib-2.0/schemas:$SNAP/usr/share/ubuntu:$SNAP/usr/local/share/:$SNAP/usr/share/:$SNAP/var/lib/snapd/desktop
-export XDG_DATA_DIR=/snap/quelea/current/usr/share/glib-2.0/schemas:$SNAP/usr/share/ubuntu:$SNAP/usr/local/share/:$SNAP/usr/share/:$SNAP/var/lib/snapd/desktop
 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 -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
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -74,8 +74,6 @@ parts:
       cp -a $SNAPCRAFT_STAGE/jar/. $SNAPCRAFT_PRIME/jar/.
       chmod +x $SNAPCRAFT_PRIME/jar/launch.sh
       rm -rf $SNAPCRAFT_PRIME/jar/winjre64
-      export GDK_PIXBUF_MODULEDIR=/snap/quelea/current/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders
       glib-compile-schemas $SNAPCRAFT_PRIME/usr/share/glib-2.0/schemas/
-      $SNAPCRAFT_PRIME/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders > $SNAPCRAFT_PRIME/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache