diff --git a/installer/snappy/filebot.sh b/installer/snappy/filebot.sh index 875110f2..25ec1b69 100755 --- a/installer/snappy/filebot.sh +++ b/installer/snappy/filebot.sh @@ -1,4 +1,7 @@ #!/bin/sh + +export LC_ALL="en.utf-8" + export PATH="$SNAP/bin:$SNAP/usr/bin:$PATH" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/lib:$SNAP/usr/lib:$SNAP/lib/x86_64-linux-gnu:$SNAP/usr/lib/x86_64-linux-gnu" @@ -7,7 +10,7 @@ export LD_LIBRARY_PATH="$SNAP/usr/lib/x86_64-linux-gnu/mesa:$LD_LIBRARY_PATH" export JAVA_HOME="$SNAP/usr/lib/jvm/default-java" export PATH="$SNAP/usr/lib/jvm/default-java/bin:$SNAP/usr/lib/jvm/default-java/jre/bin:$PATH" -export LD_LIBRARY_PATH="$SNAP/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64:$SNAP/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64:$SNAP/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64:$SNAP/usr/lib/jvm/java-8-openjdk-amd64/bin/../lib/amd64/jli:$SNAP/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/../lib/amd64/jli:$SNAP/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64:$SNAP/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/jli:$SNAP/usr/lib/x86_64-linux-gnu:$SNAP/usr/lib/x86_64-linux-gnu/pulseaudio:$LD_LIBRARY_PATH" +export LD_LIBRARY_PATH="$SNAP/usr/lib/x86_64-linux-gnu/dri/swrast_dri.so:$SNAP/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64:$SNAP/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64:$SNAP/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64:$SNAP/usr/lib/jvm/java-8-openjdk-amd64/bin/../lib/amd64/jli:$SNAP/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/../lib/amd64/jli:$SNAP/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64:$SNAP/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/jli:$SNAP/usr/lib/x86_64-linux-gnu:$SNAP/usr/lib/x86_64-linux-gnu/pulseaudio:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH=$SNAP_LIBRARY_PATH:$LD_LIBRARY_PATH @@ -17,7 +20,10 @@ export APP_ROOT="$SNAP/filebot" export APP_DATA="$SNAP_USER_DATA/data" export APP_CACHE="$SNAP_USER_DATA/cache" -printenv +export FONTCONFIG_FILE=$SNAP/fonts.conf +export LIBGL_DEBUG=verbose + +# export JAVA_OPTS="-Dswing.defaultlaf=javax.swing.plaf.nimbus.NimbusLookAndFeel -Dswing.systemlaf=javax.swing.plaf.nimbus.NimbusLookAndFeel" # start filebot -$JAVA_HOME/bin/java -Dunixfs=false -DuseGVFS=false -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" "$@" +$JAVA_HOME/bin/java -Dunixfs=false -DuseGVFS=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/fonts.conf b/installer/snappy/fonts.conf new file mode 100644 index 00000000..2a80cc63 --- /dev/null +++ b/installer/snappy/fonts.conf @@ -0,0 +1,88 @@ + + + + + + + + + /snap/filebot/current/usr/share/fonts + /snap/filebot/current/usr/local/share/fonts + fonts + + ~/.fonts + + + + + mono + + + monospace + + + + + + + sans serif + + + sans-serif + + + + + + + sans + + + sans-serif + + + + + conf.d + + + + /snap/filebot/current/var/cache/fontconfig + fontconfig + + ~/.fontconfig + + + + + 30 + + + + diff --git a/installer/snappy/snapcraft.yaml b/installer/snappy/snapcraft.yaml index 7271a234..7a6457cc 100644 --- a/installer/snappy/snapcraft.yaml +++ b/installer/snappy/snapcraft.yaml @@ -14,33 +14,37 @@ apps: plugs: - home - network + - network-bind + - network-observe - opengl - unity7 - x11 - locale-control + parts: filebot: plugin: copy files: filebot.sh: bin/filebot FileBot.jar: filebot/FileBot.jar - mediainfo: - plugin: nil - stage-packages: - - mediainfo - fpcalc: - plugin: nil - stage-packages: - - libchromaprint-tools - java: + fonts: + plugin: copy + files: + /usr/share/fonts: /usr/share/fonts + fonts.conf: fonts.conf + base: plugin: jdk source: . stage-packages: + - libgnome2-0 + - gvfs + - mediainfo + - libchromaprint-tools + - language-pack-en - openjfx - ubuntu: - plugin: nil - stage-packages: - fontconfig - - libpango-1.0-0 - libcanberra-gtk-module + - libcanberra-gtk0 + - libcanberra-gtk3-0 + - overlay-scrollbar