From bd4c692a1756fea80fd7ccd6f2a60176abdf6919 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.sourceforge.net>
Date: Tue, 12 Jul 2016 00:20:15 +0800
Subject: [PATCH] Refactor GVFS (don't require libgio)

---
 installer/snappy/filebot.sh     | 18 +++++-------------
 installer/snappy/snapcraft.yaml |  5 +++--
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/installer/snappy/filebot.sh b/installer/snappy/filebot.sh
index 16b57627..cb1998be 100755
--- a/installer/snappy/filebot.sh
+++ b/installer/snappy/filebot.sh
@@ -35,15 +35,6 @@ export LIBGL_DRIVERS_PATH=$SNAP/usr/lib/$ARCH/dri
 export JAVA_OPTS=-Dsun.java2d.xrender=True
 
 
-export APP_ROOT=$SNAP/filebot
-export APP_DATA=$SNAP_USER_DATA/data
-export APP_CACHE=$SNAP_USER_DATA/cache
-export APP_PREFS=$SNAP_USER_DATA/prefs
-
-
-
-
-
 # Set XDG_DATA_HOME to local path, dependent on snap version
 export XDG_DATA_HOME=$SNAP_USER_DATA/XDG/data-$SNAP_VERSION
 export XDG_DATA_DIRS=$XDG_DATA_HOME:$XDG_DATA_DIRS
@@ -114,8 +105,9 @@ if [ ! -d $XDG_DATA_HOME/icons ]; then
   done
 fi
 
+export APP_ROOT="$SNAP/filebot"
+export APP_DATA="$SNAP_COMMON/data"
+export APP_CACHE="$SNAP_USER_DATA/cache"
+export APP_PREFS="$SNAP_USER_COMMON/prefs"
 
-cd "$SNAP_USER_DATA"
-
-
-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" "$@"
+java -Duser.home="$SNAP_COMMON" -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 b35bd838..f00d1122 100644
--- a/installer/snappy/snapcraft.yaml
+++ b/installer/snappy/snapcraft.yaml
@@ -10,7 +10,7 @@ architectures: [amd64]
 apps:
   filebot:
     command: bin/filebot
-    plugs: [home, network, network-bind, unity7, gsettings, opengl, pulseaudio]
+    plugs: [home, network, network-bind, unity7, x11, opengl, pulseaudio]
 
 parts:
   filebot:
@@ -19,10 +19,12 @@ parts:
       filebot.sh: bin/filebot
       FileBot.jar: filebot/FileBot.jar
       lib7-Zip-JBinding.so: filebot/lib/amd64/lib7-Zip-JBinding.so
+
   oracle-java:
     plugin: copy
     files:
       oracle-java: oracle-java
+
   packages:
     plugin: nil
     stage-packages:
@@ -32,7 +34,6 @@ parts:
     - light-themes
     - libcanberra-gtk-module
     - jayatana
-    - gvfs
     - unity-gtk2-module
     - overlay-scrollbar-gtk2
     - libmediainfo0v5