From fc1c1226fe805177ac11ee1132b59b284b5e1098 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Wed, 1 Feb 2017 23:44:26 +0800
Subject: [PATCH] Include Linux native libraries for all supported platforms in
 the portable *.tar.xz package

---
 build.xml                     | 6 ++++++
 installer/portable/filebot.sh | 9 ++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 2316c110..10660d74 100644
--- a/build.xml
+++ b/build.xml
@@ -677,6 +677,12 @@
 				<cmp:tarfileset file="${path.fatjar}" fullpath="FileBot.jar" />
 				<cmp:tarfileset dir="${dir.installer}/portable" includes="*.exe, *.ini, *.cmd" />
 				<cmp:tarfileset dir="${dir.installer}/portable" includes="*.sh" filemode="755" />
+
+				<!-- include native libraries for all supported platforms -->
+				<cmp:tarfileset prefix="lib/armv7l" dir="${dir.lib}/native/linux-armv7l" includes="*.so" />
+				<cmp:tarfileset prefix="lib/armv8" dir="${dir.lib}/native/linux-armv8" includes="*.so" />
+				<cmp:tarfileset prefix="lib/i686" dir="${dir.lib}/native/linux-i686" includes="*.so" />
+				<cmp:tarfileset prefix="lib/x86_64" dir="${dir.lib}/native/linux-amd64" includes="*.so" />
 			</cmp:tar>
 		</cmp:xz>
 	</target>
diff --git a/installer/portable/filebot.sh b/installer/portable/filebot.sh
index a9c1e10f..6d42b6d1 100644
--- a/installer/portable/filebot.sh
+++ b/installer/portable/filebot.sh
@@ -17,6 +17,9 @@ WORKING_DIR=`pwd`
 PRG_DIR=`dirname "$PRG"`
 APP_ROOT=`cd "$PRG_DIR" && pwd`
 
+# add package lib folder to library path
+PACKAGE_LIBRARY_PATH="$APP_ROOT/lib/$(uname -m)"
+
 # restore original working dir
 cd "$WORKING_DIR"
 
@@ -29,11 +32,11 @@ fi
 export LANG="en_US.UTF-8"
 export LC_ALL="en_US.UTF-8"
 
-# add APP_ROOT to LD_LIBRARY_PATH
+# add APP_ROOT and PACKAGE_LIBRARY_PATH to LD_LIBRARY_PATH
 if [ ! -z "$LD_LIBRARY_PATH" ]; then
-	export LD_LIBRARY_PATH="$APP_ROOT:$LD_LIBRARY_PATH"
+	export LD_LIBRARY_PATH="$APP_ROOT:$PACKAGE_LIBRARY_PATH:$LD_LIBRARY_PATH"
 else
-	export LD_LIBRARY_PATH="$APP_ROOT"
+	export LD_LIBRARY_PATH="$APP_ROOT:$PACKAGE_LIBRARY_PATH"
 fi
 
 # choose extractor