From 69b4f70a7ce547c610b33938ce39065fa0426472 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Mon, 4 Feb 2013 14:34:39 +0000
Subject: [PATCH] * fix things up for the ubuntu software center packages

---
 build.xml                        | 24 ++++++++++++++++++++----
 installer/ubuntu/FileBot.desktop |  4 ++--
 installer/ubuntu/filebot.sh      |  2 +-
 installer/ubuntu/postinst.sh     |  2 --
 installer/ubuntu/prerem.sh       |  2 --
 website/data/query-blacklist.txt |  1 +
 website/scripts/sysinfo.groovy   |  2 +-
 7 files changed, 25 insertions(+), 12 deletions(-)
 delete mode 100644 installer/ubuntu/postinst.sh
 delete mode 100644 installer/ubuntu/prerem.sh

diff --git a/build.xml b/build.xml
index d1da779a..d925c76b 100644
--- a/build.xml
+++ b/build.xml
@@ -24,6 +24,7 @@
 	<!-- define output paths -->
 	<property name="path.fatjar" location="${dir.dist}/${title}_${version}.jar" />
 	<property name="path.appbundle.tar.gz" location="${dir.dist}/${title}_${version}.app.tar.gz" />
+	<property name="path.ubuntu-binary.tar.gz" location="${dir.dist}/filebot-${version}-ubuntu.tar.gz" />
 	<property name="path.source.zip" location="${dir.dist}/filebot-${version}-src.zip" />
 
 	<property name="deploy.release" value="web.sourceforge.net:/home/frs/project/f/fi/filebot/filebot" />
@@ -211,7 +212,7 @@
 			<javaproperty name="useExtendedFileAttributes" value="true" />
 			<javaproperty name="java.net.useSystemProxies" value="true" />
 			<javaproperty name="sun.net.client.defaultConnectTimeout" value="10000" />
-			<javaproperty name="sun.net.client.defaultReadTimeout"    value="60000" />
+			<javaproperty name="sun.net.client.defaultReadTimeout" value="60000" />
 		</jarbundler>
 
 		<!-- shell scripts -->
@@ -232,9 +233,24 @@
 	</target>
 
 
+	<target name="ppa-binary" depends="fatjar">
+		<tar longfile="gnu" compression="gzip" destfile="${path.ubuntu-binary.tar.gz}">
+			<tarfileset fullpath="i386/opt/filebot/FileBot.jar" file="${path.fatjar}" />
+			<tarfileset fullpath="amd64/opt/filebot/FileBot.jar" file="${path.fatjar}" />
+			<tarfileset prefix="i386/opt/filebot" dir="${dir.lib}/native/linux-i386" includes="*.so" />
+			<tarfileset prefix="amd64/opt/filebot" dir="${dir.lib}/native/linux-amd64" includes="*.so" />
+			<tarfileset prefix="i386/opt/filebot" file="${dir.installer}/ubuntu/FileBot.desktop" />
+			<tarfileset prefix="amd64/opt/filebot" file="${dir.installer}/ubuntu/FileBot.desktop" />
+			<tarfileset prefix="i386/opt/filebot" file="${dir.installer}/icons/icon.svg" />
+			<tarfileset prefix="amd64/opt/filebot" file="${dir.installer}/icons/icon.svg" />
+			<tarfileset prefix="i386/opt/filebot/bin" file="${dir.installer}/ubuntu/filebot.sh" filemode="755" />
+			<tarfileset prefix="amd64/opt/filebot/bin" file="${dir.installer}/ubuntu/filebot.sh" filemode="755" />
+		</tar>
+	</target>
+
+
 	<target name="deb" depends="fatjar" description="Build debian package for i386 and amd64">
 		<taskdef resource="ant_deb_task.properties" classpath="${dir.lib}/build/ant-deb.jar" />
-
 		<antcall target="deb-arch">
 			<param name="arch" value="i386" />
 		</antcall>
@@ -244,7 +260,7 @@
 	</target>
 
 	<target name="deb-arch">
-		<deb todir="${dir.dist}" package="filebot" version="${version}" architecture="${arch}" section="misc" depends="openjdk-7-jre | default-jre-headless" recommends="libchromaprint-tools" homepage="http://filebot.sourceforge.net" priority="optional" postinst="${dir.installer}/deb/postinst.sh" prerm="${dir.installer}/deb/prerem.sh">
+		<deb todir="${dir.dist}" package="filebot" version="${version}" architecture="${arch}" section="misc" depends="openjdk-7-jre, libchromaprint-tools" homepage="http://filebot.sourceforge.net" priority="optional" postinst="${dir.installer}/deb/postinst.sh" prerm="${dir.installer}/deb/prerem.sh">
 			<maintainer name="Reinhard Pointner" email="rednoah@users.sourceforge.net" />
 			<description synopsis="The ultimate TV and Movie Renamer">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.</description>
 			<tarfileset fullpath="usr/share/filebot/FileBot.jar" file="${path.fatjar}" />
@@ -270,7 +286,7 @@
 	<target name="ipkg-arch">
 		<deb todir="${dir.dist}" package="filebot" version="${version}" architecture="${arch}" section="misc" homepage="http://filebot.sourceforge.net" priority="optional" postinst="${dir.installer}/ipkg/postinst.sh" prerm="${dir.installer}/ipkg/prerem.sh">
 			<maintainer name="Reinhard Pointner" email="rednoah@users.sourceforge.net" />
-			<description synopsis="The ultimate tv renamer / subtitle downloader / sfv validator">FileBot is the ultimate tool for renaming your tv shows and anime, downloading subtitles from various sources or just simple file verification.</description>
+			<description synopsis="The ultimate TV and Movie Renamer">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.</description>
 			<tarfileset fullpath="usr/share/filebot/FileBot.jar" file="${path.fatjar}" />
 			<tarfileset prefix="usr/share/filebot" dir="${dir.lib}/native/linux-${arch}" includes="*.so" />
 			<tarfileset prefix="usr/share/filebot/bin" file="${dir.installer}/ipkg/filebot.sh" filemode="755" />
diff --git a/installer/ubuntu/FileBot.desktop b/installer/ubuntu/FileBot.desktop
index 02d71d69..35d947ab 100644
--- a/installer/ubuntu/FileBot.desktop
+++ b/installer/ubuntu/FileBot.desktop
@@ -4,6 +4,6 @@ Type=Application
 Terminal=false
 Name=FileBot
 Comment=The ultimate TV and Movie Renamer
-Exec=/usr/share/filebot/bin/filebot.sh
-Icon=/usr/share/filebot/icon.svg
+Exec=/opt/filebot/bin/filebot.sh
+Icon=/opt/filebot/icon.svg
 Categories=AudioVideo;Video;Renamer
diff --git a/installer/ubuntu/filebot.sh b/installer/ubuntu/filebot.sh
index 6c499c60..726acb18 100644
--- a/installer/ubuntu/filebot.sh
+++ b/installer/ubuntu/filebot.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -Xmx256m -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.update=skip -Dapplication.deployment=ppa -Dapplication.analytics=false -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -jar /usr/share/filebot/FileBot.jar "$@"
\ No newline at end of file
+java -Xmx256m -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.update=skip -Dapplication.deployment=ppa -Dapplication.analytics=false -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/opt/filebot -Djava.library.path=/opt/filebot -jar /opt/filebot/FileBot.jar "$@"
\ No newline at end of file
diff --git a/installer/ubuntu/postinst.sh b/installer/ubuntu/postinst.sh
deleted file mode 100644
index 62a8b496..00000000
--- a/installer/ubuntu/postinst.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-ln -s /usr/share/filebot/bin/filebot.sh /usr/bin/filebot
diff --git a/installer/ubuntu/prerem.sh b/installer/ubuntu/prerem.sh
deleted file mode 100644
index 2b96768c..00000000
--- a/installer/ubuntu/prerem.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-rm /usr/bin/filebot
diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt
index 1b89918f..b8311419 100644
--- a/website/data/query-blacklist.txt
+++ b/website/data/query-blacklist.txt
@@ -29,6 +29,7 @@
 ^Erotic$
 ^extract$
 ^extracted$
+^Family$
 ^Film$
 ^Film[s]?
 ^Filme$
diff --git a/website/scripts/sysinfo.groovy b/website/scripts/sysinfo.groovy
index a65bd941..dd88135d 100644
--- a/website/scripts/sysinfo.groovy
+++ b/website/scripts/sysinfo.groovy
@@ -33,7 +33,7 @@ try {
 	print 'Extended Attributes: '
 	if (net.sourceforge.filebot.Settings.useExtendedFileAttributes()){
 		// create new temp file
-		def f = new File('.xattr-test')
+		def f = new File(net.sourceforge.filebot.Settings.applicationFolder, '.xattr-test')
 		f.createNewFile() && f.deleteOnExit()
 		
 		// xattr write, read and verify