diff --git a/installer/snappy/.gitignore b/installer/snappy/.gitignore index 688376d8..4baff574 100644 --- a/installer/snappy/.gitignore +++ b/installer/snappy/.gitignore @@ -1,6 +1,8 @@ +oracle-java + parts snap stage *.jar -*.snap \ No newline at end of file +*.snap diff --git a/installer/snappy/filebot.sh b/installer/snappy/filebot.sh index 67e13497..a94664f1 100755 --- a/installer/snappy/filebot.sh +++ b/installer/snappy/filebot.sh @@ -7,17 +7,14 @@ export LD_LIBRARY_PATH="$SNAP/lib:$SNAP/usr/lib:$SNAP/lib/x86_64-linux-gnu:$SNAP export LD_LIBRARY_PATH="$SNAP/usr/lib/x86_64-linux-gnu/mesa:$LD_LIBRARY_PATH" -export JAVA_HOME="$SNAP/usr/lib/jvm/java-8-openjdk-amd64" +export JAVA_HOME="$SNAP/oracle-java" export PATH="$JAVA_HOME/bin:$JAVA_HOME/jre/bin:$PATH" - -export JRE_LIB="$SNAP/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64" -export LD_LIBRARY_PATH="$JRE_LIB:$JRE_LIB/jli:$LD_LIBRARY_PATH" - +export LD_LIBRARY_PATH="$SNAP/oracle-java/lib/amd64/jli:$SNAP/oracle-java/lib/amd64:$SNAP/oracle-java/jre/lib/amd64:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$SNAP/usr/lib/x86_64-linux-gnu/mesa:$SNAP/usr/lib/x86_64-linux-gnu/dri:$LD_LIBRARY_PATH" -export LD_LIBRARY_PATH="$SNAP/usr/lib/x86_64-linux-gnu/gtk-2.0/modules:$SNAP/usr/lib/x86_64-linux-gnu/gtk-2.0:$LD_LIBRARY_PATH" +export LD_LIBRARY_PATH="$SNAP/usr/lib/x86_64-linux-gnu/gtk-2.0/2.10.0/engines:$SNAP/usr/lib/x86_64-linux-gnu/gtk-2.0/modules:$SNAP/usr/lib/x86_64-linux-gnu/gtk-2.0:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$SNAP/usr/lib/x86_64-linux-gnu:$SNAP/usr/lib/x86_64-linux-gnu/pulseaudio:$LD_LIBRARY_PATH" @@ -26,12 +23,14 @@ export LD_LIBRARY_PATH="$SNAP_LIBRARY_PATH:$LD_LIBRARY_PATH" export GDK_PIXBUF_MODULEDIR="$SNAP/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0" export GDK_PIXBUF_MODULE_FILE="$SNAP/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache" +export LIBGL_DRIVERS_PATH="$SNAP/usr/lib/x86_64-linux-gnu/dri" + export APP_ROOT="$SNAP/filebot" export APP_DATA="$SNAP_USER_DATA/data" export APP_CACHE="$SNAP_USER_DATA/cache" -export FONTCONFIG_FILE="$SNAP/fonts.conf" +export FONTCONFIG_FILE="$SNAP/fonts.conf" # causes startup lag the first time the font cache is initialized export LIBGL_DEBUG=verbose export G_MESSAGES_DEBUG=all @@ -40,8 +39,26 @@ export GTK2_MODULES="overlay-scrollbar" export GTK_MODULES="" export GTK2_MODULES="" -glxgears +export GTK_PATH="$SNAP/usr/lib/x86_64-linux-gnu/gtk-2.0/2.10.0" -export JAVA_OPTS="-Dswing.systemlaf=javax.swing.plaf.nimbus.NimbusLookAndFeel" +# export GIO_MODULE_DIR="$SNAP/usr/lib/x86_64-linux-gnu/gio/modules" +# export LD_LIBRARY_PATH="$GIO_MODULE_DIR:$LD_LIBRARY_PATH" -java -Djava.library.path=$LD_LIBRARY_PATH -Dunixfs=false -DuseGVFS=false -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dsun.java2d.xrender=true -Djava.net.useSystemProxies=true -Dapplication.update=skip -Dapplication.deployment=usc -Dnet.filebot.UserFiles.fileChooser=JavaFX "-Dapplication.dir=$APP_DATA" "-Dapplication.cache=$APP_CACHE/ehcache.disk.store" "-Djava.io.tmpdir=$APP_CACHE/java.io.tmpdir" "-Dnet.filebot.AcoustID.fpcalc=$SNAP/usr/bin/fpcalc" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@" +export GTK2_RC_FILES="$SNAP/usr/share/themes/Ambiance/gtk-2.0/gtkrc" +export GTK_THEME="$SNAP/usr/share/themes/Ambiance/gtk-3.0/gtk.css" + +# Not good, needed for fontconfig +export XDG_DATA_HOME="$SNAP/usr/share" +export GSETTINGS_SCHEMA_DIR="$SNAP/usr/share/glib-2.0/schemas" + +# Font Config +export FONTCONFIG_PATH="$SNAP/etc/fonts/config.d" +export FONTCONFIG_FILE="$SNAP/etc/fonts/fonts.conf" + +export ORIGIN="$SNAP/usr/lib/x86_64-linux-gnu" + +# export JAVA_OPTS="-Dswing.systemlaf=javax.swing.plaf.nimbus.NimbusLookAndFeel $JAVA_OPTS" +# export JAVA_OPTS="-Dsun.java2d.opengl=True $JAVA_OPTS" +# export JAVA_OPTS="-Dsun.java2d.xrender=True $JAVA_OPTS" + +java -Djava.library.path="$LD_LIBRARY_PATH" -Djna.library.path="$LD_LIBRARY_PATH" -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Djava.net.useSystemProxies=true -Dapplication.update=skip -Dapplication.deployment=usc -Dnet.filebot.UserFiles.fileChooser=JavaFX -Dapplication.dir="$APP_DATA" -Dapplication.cache="$APP_CACHE/ehcache.disk.store" -Djava.io.tmpdir="$APP_CACHE/java.io.tmpdir" "-Dnet.filebot.AcoustID.fpcalc=$SNAP/usr/bin/fpcalc" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@" diff --git a/installer/snappy/snapcraft.yaml b/installer/snappy/snapcraft.yaml index 1e086d19..67a9a132 100644 --- a/installer/snappy/snapcraft.yaml +++ b/installer/snappy/snapcraft.yaml @@ -14,12 +14,9 @@ apps: plugs: - home - network - - network-bind - - network-observe - opengl - unity7 - x11 - - locale-control parts: @@ -28,27 +25,32 @@ parts: files: filebot.sh: bin/filebot FileBot.jar: filebot/FileBot.jar - fonts: + oracle-java: plugin: copy files: + oracle-java: oracle-java + ubuntu: + plugin: copy + files: + /usr/share/locale: usr/share/locale /usr/share/fonts: usr/share/fonts - fonts.conf: fonts.conf packages: plugin: nil stage-packages: - - libmediainfo0v5 - - libchromaprint-tools - - openjdk-8-jre - - openjfx + - libgl1-mesa-dri - fontconfig - - jayatana - - gvfs - - mesa-utils +# - gtk2-engines-murrine +# - light-themes +# - libcanberra-gtk-module +# - jayatana +# - gvfs +# - dconf +# - proxy +# - libmediainfo0v5 +# - libchromaprint-tools loaders: plugin: copy files: loaders.cache: usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache stage-packages: - - libwmf0.2-7-gtk - - librsvg2-common - libgdk-pixbuf2.0-0