diff --git a/installer/snappy/filebot.sh b/installer/snappy/filebot.sh index d885e083..58ea0a01 100755 --- a/installer/snappy/filebot.sh +++ b/installer/snappy/filebot.sh @@ -1,15 +1,7 @@ #!/bin/sh - -if [ $SNAP_ARCH != amd64 ]; then - echo "CPU architecture not supported: $SNAP_ARCH" - exit 1 -fi - - export LANG=C.UTF-8 export ARCH=x86_64-linux-gnu - export JAVA_HOME=$SNAP/oracle-java export PATH=$JAVA_HOME/jre/bin:$PATH @@ -50,4 +42,4 @@ export APP_DATA=$SNAP_USER_DATA/data export APP_CACHE=$SNAP_USER_DATA/cache export APP_PREFS=$SNAP_USER_DATA/prefs -java -Djava.library.path="$LD_LIBRARY_PATH" -Djna.library.path="$LD_LIBRARY_PATH" -Dunixfs=false -DuseGVFS=true -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" -Djava.util.prefs.userRoot="$APP_PREFS/user" -Djava.util.prefs.systemRoot="$APP_PREFS/system" -Dnet.filebot.AcoustID.fpcalc="$SNAP/usr/bin/fpcalc" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@" +java -Duser.home="$SNAP_USER_DATA" -Djava.library.path="$LD_LIBRARY_PATH" -Djna.library.path="$LD_LIBRARY_PATH" -Dunixfs=false -DuseGVFS=true -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" -Djava.util.prefs.userRoot="$APP_PREFS/user" -Djava.util.prefs.systemRoot="$APP_PREFS/system" -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 9bdc43e3..f13aaae9 100644 --- a/installer/snappy/snapcraft.yaml +++ b/installer/snappy/snapcraft.yaml @@ -3,21 +3,14 @@ version: 4.7 summary: The ultimate TV and Movie Renamer / Subtitle Downloader description: FileBot is the ultimate tool for renaming your movies, tv shows or anime and even downloading subtitles. It's smart, streamlined for simplicity and just works. Putting the super-efficient UI aside, it's also got a full-featured command-line interface and scripting engine for all sorts of automation. Anything is possible. -confinement: devmode +confinement: strict -architectures: -- amd64 +architectures: [amd64] apps: filebot: command: bin/filebot - plugs: - - home - - network - - opengl - - unity7 - - x11 - + plugs: [home, network, network-bind, opengl, unity7] parts: filebot: @@ -41,8 +34,8 @@ parts: - gvfs - unity-gtk2-module - overlay-scrollbar-gtk2 -# - libmediainfo0v5 -# - libchromaprint-tools + - libmediainfo0v5 + - libchromaprint-tools loaders: plugin: copy files: