From cdc822b0904a66743dea91eaef586c2518bf93bb Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.sourceforge.net>
Date: Fri, 5 Aug 2016 21:20:23 +0800
Subject: [PATCH] Use OpenJDK # Sorry Jessica

---
 installer/snappy/filebot.sh     | 12 ++++--------
 installer/snappy/snapcraft.yaml | 15 +++++++--------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/installer/snappy/filebot.sh b/installer/snappy/filebot.sh
index 4d6f38b8..3c07af85 100755
--- a/installer/snappy/filebot.sh
+++ b/installer/snappy/filebot.sh
@@ -1,15 +1,11 @@
 #!/bin/bash
 export LANG=C.UTF-8
-export ARCH=x86_64-linux-gnu
 
-export JAVA_HOME=$SNAP/oracle-java
-export PATH=$JAVA_HOME/jre/bin:$PATH
+export JAVA_HOME="$SNAP/usr/lib/jvm/java-8-openjdk-$SNAP_ARCH"
+# export JAVA_TOOL_OPTIONS="-javaagent:$SNAP/usr/share/java/jayatanaag.jar"
 
-export LD_LIBRARY_PATH=$JAVA_HOME/jre/lib/$SNAP_ARCH/jli:$JAVA_HOME/jre/lib/$SNAP_ARCH:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=$SNAP/filebot/lib/$SNAP_ARCH:$LD_LIBRARY_PATH
-
-# export JAVA_TOOL_OPTIONS=-javaagent:$SNAP/usr/share/java/jayatanaag.jar
-# export JAVA_OPTS=-Dsun.java2d.xrender=True
+export PATH="$JAVA_HOME/jre/bin:$PATH"
+export LD_LIBRARY_PATH="$SNAP/filebot/lib/$SNAP_ARCH:$LD_LIBRARY_PATH"
 
 export APP_ROOT="$SNAP/filebot"
 export APP_DATA="$SNAP_USER_DATA/data"
diff --git a/installer/snappy/snapcraft.yaml b/installer/snappy/snapcraft.yaml
index d935347f..1051cf71 100644
--- a/installer/snappy/snapcraft.yaml
+++ b/installer/snappy/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: filebot
-version: 4.7.1~snap3
+version: 4.7.2~snap1
 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.
 
@@ -10,7 +10,7 @@ architectures: [amd64]
 apps:
   filebot:
     command: desktop-launch $SNAP/filebot/filebot.sh
-    plugs: [unity7, opengl, gsettings, home, x11, network, network-bind, pulseaudio]
+    plugs: [unity7, opengl, x11, home, network, network-bind, pulseaudio, gsettings]
 
 parts:
   filebot:
@@ -19,11 +19,10 @@ parts:
       filebot.sh: filebot/filebot.sh
       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:
+  java:
     plugin: nil
-    stage-packages: [jayatana]
+    stage-packages: [openjdk-8-jre, openjfx, jayatana]
     after: [desktop/gtk2]
+  mediainfo:
+    plugin: nil
+    stage-packages: [libmediainfo0v5, libchromaprint-tools]