From acf8a061bdeaa6890e2a32839aebc79fc853abbb Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Tue, 7 Feb 2017 21:50:37 +0800
Subject: [PATCH] Remove ipk package and replace with armhf deb package

---
 build.xml                               | 34 +++++++++----------------
 installer/deb/{deb => }/FileBot.desktop |  0
 installer/deb/{deb => }/filebot.sh      |  2 +-
 installer/deb/ipk/filebot.sh            | 29 ---------------------
 website/download.php                    |  2 --
 website/index.html                      |  2 +-
 6 files changed, 14 insertions(+), 55 deletions(-)
 rename installer/deb/{deb => }/FileBot.desktop (100%)
 rename installer/deb/{deb => }/filebot.sh (94%)
 delete mode 100644 installer/deb/ipk/filebot.sh

diff --git a/build.xml b/build.xml
index 10660d74..ec527d46 100644
--- a/build.xml
+++ b/build.xml
@@ -548,47 +548,38 @@
 		<antcall target="deb-arch">
 			<param name="arch" value="amd64" />
 			<param name="deb.arch" value="amd64" />
-			<param name="deb.pkg" value="deb" />
-			<param name="deb.prefix" value="/usr" />
 		</antcall>
 
 		<!-- arch i686 not allowed by deb specification, must be i386 for 32-bit x86 systems -->
 		<antcall target="deb-arch">
 			<param name="arch" value="i686" />
 			<param name="deb.arch" value="i386" />
-			<param name="deb.pkg" value="deb" />
-			<param name="deb.prefix" value="/usr" />
 		</antcall>
-	</target>
 
-
-	<target name="ipkg" description="Build embedded Linux packages" depends="revision">
+		<!-- arch armv7l not allowed by deb specification, must be armhf for 32-bit armv7l systems -->
 		<antcall target="deb-arch">
-			<param name="arch" value="noarch" />
-			<param name="deb.arch" value="noarch" />
-			<param name="deb.pkg" value="ipk" />
-			<param name="deb.prefix" value="/opt" />
+			<param name="arch" value="armv7l" />
+			<param name="deb.arch" value="armhf" />
 		</antcall>
 	</target>
 
 
 	<target name="deb-arch">
-		<property name="dir.staging" location="${dir.dist}/${deb.pkg}/${arch}" />
+		<property name="dir.staging" location="${dir.dist}/deb/${arch}" />
 
 		<copy-replace todir="${dir.staging}">
-			<fileset dir="${dir.installer}/deb/${deb.pkg}" />
-			<fileset dir="${dir.installer}/deb" includes="control/**" />
+			<fileset dir="${dir.installer}/deb" />
 		</copy-replace>
-		<copy todir="${dir.staging}" verbose="true" failonerror="false">
+		<copy todir="${dir.staging}">
 			<fileset dir="${dir.lib}/native/linux-${arch}" />
 			<fileset file="${dir.installer}/icons/icon.svg" />
 		</copy>
-		<copy file="${path.fatjar}" tofile="${dir.staging}/FileBot.jar" verbose="true" />
+		<copy file="${path.fatjar}" tofile="${dir.staging}/FileBot.jar" />
 
-		<jdeb destfile="${dir.dist}/${package.name}_${version}_${deb.arch}.${deb.pkg}" control="${dir.staging}/control" compression="xz" changesIn="${dir.staging}/changes.txt" changesOut="${dir.dist}/${package.name}_${version}_${deb.arch}.${deb.pkg}.changes" verbose="true">
-			<tarfileset prefix="${deb.prefix}/share/filebot" dir="${dir.staging}" includes="*.sh, fpcalc" filemode="755" />
-			<tarfileset prefix="${deb.prefix}/share/filebot" dir="${dir.staging}" includes="*.jar, *.so, *.svg" />
-			<tarfileset prefix="${deb.prefix}/share/applications" dir="${dir.staging}" includes="*.desktop" />
+		<jdeb destfile="${dir.dist}/${package.name}_${version}_${deb.arch}.deb" control="${dir.staging}/control" compression="xz" changesIn="${dir.staging}/changes.txt" changesOut="${dir.dist}/${package.name}_${version}_${deb.arch}.deb.changes" verbose="true">
+			<tarfileset prefix="/usr/share/filebot" dir="${dir.staging}" includes="*.sh, fpcalc" filemode="755" />
+			<tarfileset prefix="/usr/share/filebot" dir="${dir.staging}" includes="*.jar, *.so, *.svg" />
+			<tarfileset prefix="/usr/share/applications" dir="${dir.staging}" includes="*.desktop" />
 		</jdeb>
 	</target>
 
@@ -780,7 +771,7 @@
 	</target>
 
 
-	<target name="stage-release" depends="fatjar, spk, deb, ipkg, portable, appbundle, msi">
+	<target name="stage-release" depends="fatjar, spk, deb, portable, appbundle, msi">
 		<!-- ensure clean release dir -->
 		<delete dir="${dir.release}" />
 		<mkdir dir="${dir.release}" />
@@ -792,7 +783,6 @@
 				<include name="*.tar.xz" />
 				<include name="*.msi" />
 				<include name="*.deb" />
-				<include name="*.ipk" />
 				<include name="*.spk" />
 			</fileset>
 		</copy>
diff --git a/installer/deb/deb/FileBot.desktop b/installer/deb/FileBot.desktop
similarity index 100%
rename from installer/deb/deb/FileBot.desktop
rename to installer/deb/FileBot.desktop
diff --git a/installer/deb/deb/filebot.sh b/installer/deb/filebot.sh
similarity index 94%
rename from installer/deb/deb/filebot.sh
rename to installer/deb/filebot.sh
index 50a01b0e..13503475 100644
--- a/installer/deb/deb/filebot.sh
+++ b/installer/deb/filebot.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-APP_ROOT=@{deb.prefix}/share/filebot
+APP_ROOT=/usr/share/filebot
 
 if [ -z "$HOME" ]; then
 	echo '$HOME must be set'
diff --git a/installer/deb/ipk/filebot.sh b/installer/deb/ipk/filebot.sh
deleted file mode 100644
index 55ad6112..00000000
--- a/installer/deb/ipk/filebot.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-APP_ROOT=@{deb.prefix}/share/filebot
-
-# make sure required environment variables are set
-if [ -z "$USER" ]; then
-	export USER=`whoami`
-fi
-
-# force JVM language and encoding settings
-export LANG="C.UTF-8"
-export LC_ALL="C.UTF-8"
-
-# add APP_ROOT to LD_LIBRARY_PATH
-if [ ! -z "$LD_LIBRARY_PATH" ]; then
-	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$APP_ROOT"
-else
-	export LD_LIBRARY_PATH="$APP_ROOT"
-fi
-
-# choose extractor
-EXTRACTOR="ApacheVFS"					# use Apache Commons VFS2 with junrar plugin
-# EXTRACTOR="SevenZipExecutable"		# use the 7z executable
-# EXTRACTOR="SevenZipNativeBindings"	# use the lib7-Zip-JBinding.so native library
-
-# select application data folder
-APP_DATA="$APP_ROOT/data/$USER"
-
-# start filebot
-java -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding="UTF-8" -Djna.nosys=false -Djna.nounpack=true -Dsun.jnu.encoding="UTF-8" -Dapplication.deployment=ipkg -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir="$APP_DATA" -Djava.io.tmpdir="$APP_DATA/temp" -Duser.home="$APP_DATA" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@"
diff --git a/website/download.php b/website/download.php
index affbfeed..25c872e5 100644
--- a/website/download.php
+++ b/website/download.php
@@ -22,8 +22,6 @@ if ($type == 'nsis') {
 	$file =  'filebot_'.$version.'_'.$arch.'.deb';
 } else if ($type == 'portable') {
 	$file = 'FileBot_'.$version.'-portable.tar.xz';
-} else if ($type == 'ipkg') {
-	$file = 'filebot_'.$version.'_noarch.ipk';
 } else {
 	$folder = 'https://sourceforge.net/projects/filebot/files/filebot/FileBot_'.$version;	// redirect to latest release folder by default
 }
diff --git a/website/index.html b/website/index.html
index 9a612025..aa844ac1 100644
--- a/website/index.html
+++ b/website/index.html
@@ -296,7 +296,7 @@
 						<li class="macappstore" style="display:none">FileBot command-line tools for Mac are available <a target="_blank" href="https://www.filebot.net/forums/viewtopic.php?t=2049">via brew cask</a></li>
 						<li class="nsis" style="display:none">Windows installer: <a target="_blank" href="https://app.filebot.net/files/FileBot-setup.exe">FileBot_@{version}-setup.exe</a> <small class="comment">for Windows 8 and earlier</small></li>
 						<li>Debian packages: <a target="_blank" href="https://app.filebot.net/download.php?type=deb&amp;arch=i386&amp;version=@{version}">filebot_@{version}_i386.deb</a> or <a target="_blank" href="https://app.filebot.net/download.php?type=deb&amp;arch=amd64&amp;version=@{version}">filebot_@{version}_amd64.deb</a></li>
-						<li>Embedded Linux package: <a target="_blank" href="https://app.filebot.net/download.php?type=ipkg&amp;arch=noarch&amp;version=@{version}">filebot_@{version}_noarch.ipk</a></li>
+						<li>Embedded Linux package: <a target="_blank" href="https://app.filebot.net/download.php?type=deb&amp;arch=armhf&amp;version=@{version}">filebot_@{version}_armhf.deb</a>
 						<li>Portable package: <a target="_blank" href="https://app.filebot.net/download.php?type=portable&amp;version=@{version}">FileBot-@{version}-portable.tar.xz</a>
 							<ul>
 								<li>This package does not include the <a href="https://github.com/filebot/filebot/tree/master/lib/native" target="_blank">MediaInfo and 7-Zip native libraries</a></li>