From 748a290e5c2d4929ed548b7d8daa34035afd6a76 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@filebot.net>
Date: Thu, 21 Jun 2018 00:33:09 +0700
Subject: [PATCH] Update snap package (still broken though)

---
 build.xml                          | 12 +++++++-----
 installer/snap/.gitignore          | 10 ----------
 installer/snap/root/bin/filebot.sh | 14 --------------
 installer/snap/snapcraft.yaml      | 16 +++-------------
 4 files changed, 10 insertions(+), 42 deletions(-)
 delete mode 100644 installer/snap/.gitignore
 delete mode 100755 installer/snap/root/bin/filebot.sh

diff --git a/build.xml b/build.xml
index b655afe6..1ec79d4e 100644
--- a/build.xml
+++ b/build.xml
@@ -480,22 +480,24 @@
 
 	<target name="snap" depends="revision">
 		<property name="dir.staging" location="${dir.dist}/snap" />
-		<property name="dir.root" location="${dir.staging}/root" />
+		<property name="dir.base" location="${dir.staging}/base" />
+
+		<get-linux-jre dest="${dir.base}/jre" />
 
 		<!-- copy files and resolve ant variables -->
 		<copy-replace todir="${dir.staging}">
 			<fileset dir="${dir.installer}/snap" />
 		</copy-replace>
 
-		<copy todir="${dir.root}/filebot/jar">
+		<copy todir="${dir.base}/filebot/jar">
 			<fileset dir="${dir.dist}/lib" includes="*.jar" />
 		</copy>
-		<copy todir="${dir.root}/filebot/lib">
+		<copy todir="${dir.base}/filebot/lib">
 			<fileset dir="${dir.lib}/native/linux-amd64" />
 		</copy>
 		<chmod perm="+x" verbose="yes">
-			<fileset dir="${dir.root}" includes="**/bin/**" />
-			<fileset dir="${dir.root}" includes="**/fpcalc" />
+			<fileset dir="${dir.base}" includes="**/bin/**" />
+			<fileset dir="${dir.base}" includes="**/fpcalc" />
 		</chmod>
 
 		<exec executable="snapcraft" dir="${dir.staging}" failonerror="yes">
diff --git a/installer/snap/.gitignore b/installer/snap/.gitignore
deleted file mode 100644
index 7f78096c..00000000
--- a/installer/snap/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-parts
-stage
-prime
-snap
-
-oracle-java
-
-*.jar
-*.so
-*.snap
diff --git a/installer/snap/root/bin/filebot.sh b/installer/snap/root/bin/filebot.sh
deleted file mode 100755
index 0b5d6471..00000000
--- a/installer/snap/root/bin/filebot.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-export LANG="en_US.UTF-8"
-export LC_ALL="en_US.UTF-8"
-
-export JAVA_HOME="$SNAP/usr/lib/jvm/java-8-openjdk-$SNAP_ARCH"
-export PATH="$JAVA_HOME/jre/bin:$PATH"
-
-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"
-
-java -Djdk.gtk.version=2 @{java.application.options} -Dapplication.deployment=snap -Dapplication.update=skip -Dapplication.help=ask -Djava.library.path="$APP_ROOT/lib" -Djna.library.path="$APP_ROOT/lib" -Djna.boot.library.path="$APP_ROOT/lib" -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dnet.filebot.UserFiles.fileChooser=JavaFX -DuseGVFS=true -Dnet.filebot.gio.GVFS="/run/user/$(id -u)/gvfs" -Duser.home="$SNAP_USER_DATA" -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="$APP_ROOT/lib/fpcalc" $JAVA_OPTS -classpath "$APP_ROOT/jar/*" @{main.class} "$@"
diff --git a/installer/snap/snapcraft.yaml b/installer/snap/snapcraft.yaml
index def65cd8..6687fa83 100644
--- a/installer/snap/snapcraft.yaml
+++ b/installer/snap/snapcraft.yaml
@@ -16,22 +16,12 @@ apps:
 parts:
   filebot:
     plugin: dump
-    source: root
-  java:
-    plugin: nil
+    source: base
     stage-packages:
-      - openjdk-8-jdk
-      - openjfx
-      - jayatana
-      - ca-certificates-java
-      - ca-certificates
       - gtk2-engines-murrine
       - hicolor-icon-theme
-    after:
-      - desktop-gtk2
-  mediainfo:
-    plugin: nil
-    stage-packages:
       - libmediainfo0v5
       - libchromaprint-tools
       - curl
+    after:
+      - desktop-gtk2