From 1dc3a065ffebd2025fc58cee45ac7b1af9179313 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Fri, 25 Nov 2016 04:26:32 +0800
Subject: [PATCH] Fix snappy build

---
 build.xml                           | 4 +++-
 installer/snappy/filebot/filebot.sh | 2 +-
 installer/snappy/snapcraft.yaml     | 8 +++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index fc95724f..3998e4bd 100644
--- a/build.xml
+++ b/build.xml
@@ -510,7 +510,9 @@
 
 	<target name="snap" depends="revision">
 		<copy tofile="${dir.dist}/snappy/filebot/FileBot.jar" file="${path.fatjar}" />
-		<copy todir="${dir.dist}/snappy/filebot/lib/amd64">
+
+		<!-- include native binaries that are not available via apt -->
+		<copy todir="${dir.dist}/snappy/filebot">
 			<fileset dir="${dir.lib}/native/linux-amd64" excludes="fpcalc, libmediainfo.so, libzen.so" />
 		</copy>
 
diff --git a/installer/snappy/filebot/filebot.sh b/installer/snappy/filebot/filebot.sh
index f3eebde1..b268f2aa 100755
--- a/installer/snappy/filebot/filebot.sh
+++ b/installer/snappy/filebot/filebot.sh
@@ -6,7 +6,7 @@ export JAVA_HOME="$SNAP/usr/lib/jvm/java-8-openjdk-$SNAP_ARCH"
 # export JAVA_TOOL_OPTIONS="-javaagent:$SNAP/usr/share/java/jayatanaag.jar"
 
 export PATH="$JAVA_HOME/jre/bin:$PATH"
-export LD_LIBRARY_PATH="$SNAP/filebot/lib/$SNAP_ARCH:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH="$SNAP:$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 e253522e..8ab9bfc0 100644
--- a/installer/snappy/snapcraft.yaml
+++ b/installer/snappy/snapcraft.yaml
@@ -10,19 +10,17 @@ architectures: [amd64]
 
 apps:
   filebot:
-    command: desktop-launch $SNAP/filebot/filebot.sh
+    command: desktop-launch $SNAP/filebot.sh
     plugs: [unity7, opengl, x11, home, network, network-bind, pulseaudio, gsettings]
 
 parts:
   filebot:
     plugin: dump
-    source: .
-    organize:
-      filebot: filebot
-    after: [desktop-gtk2]
+    source: filebot
   java:
     plugin: nil
     stage-packages: [openjdk-8-jre, openjfx, jayatana]
+    after: [desktop-gtk2]
   mediainfo:
     plugin: nil
     stage-packages: [libmediainfo0v5, libchromaprint-tools]