From b55c0e3fbf601e35ba0b36963a25f8c7641f38c1 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Tue, 28 Jan 2014 15:38:16 +0000 Subject: [PATCH] * set -DuseCreationDate explicitly depending on each platforms capabilities --- build.xml | 1 + installer/deb/FileBot.desktop | 2 +- installer/deb/filebot.sh | 2 +- installer/deb/postinst.sh | 5 +++++ installer/deb/prerem.sh | 5 +++++ installer/ipkg/postinst.sh | 5 +++++ installer/ipkg/prerem.sh | 5 +++++ installer/portable/filebot.sh | 2 +- installer/ubuntu/FileBot.desktop | 2 +- installer/ubuntu/filebot.sh | 2 +- installer/webstart/filebot.jnlp | 3 ++- 11 files changed, 28 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index de98ba49..91051f59 100644 --- a/build.xml +++ b/build.xml @@ -221,6 +221,7 @@ + diff --git a/installer/deb/FileBot.desktop b/installer/deb/FileBot.desktop index 2d117b80..119e61ab 100644 --- a/installer/deb/FileBot.desktop +++ b/installer/deb/FileBot.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=FileBot -Comment=Rename Movies and TV Shows +Comment=Rename Movies or TV Shows and download Subtitles Type=Application Exec=/usr/share/filebot/bin/filebot.sh Icon=/usr/share/filebot/icon.svg diff --git a/installer/deb/filebot.sh b/installer/deb/filebot.sh index 6698c0d9..9d40ded7 100644 --- a/installer/deb/filebot.sh +++ b/installer/deb/filebot.sh @@ -1,2 +1,2 @@ #!/bin/bash -java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=false -Djava.net.useSystemProxies=false -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=deb -Dapplication.analytics=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -Dnet.sourceforge.filebot.AcoustID.fpcalc=/usr/share/filebot/fpcalc -jar /usr/share/filebot/FileBot.jar "$@" \ No newline at end of file +java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=false -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=deb -Dapplication.analytics=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -Dnet.sourceforge.filebot.AcoustID.fpcalc=/usr/share/filebot/fpcalc -jar /usr/share/filebot/FileBot.jar "$@" \ No newline at end of file diff --git a/installer/deb/postinst.sh b/installer/deb/postinst.sh index 62a8b496..da50019e 100644 --- a/installer/deb/postinst.sh +++ b/installer/deb/postinst.sh @@ -1,2 +1,7 @@ #!/bin/sh + +# create /bin symlink ln -s /usr/share/filebot/bin/filebot.sh /usr/bin/filebot + +# delete caches and logs +filebot -clear-cache diff --git a/installer/deb/prerem.sh b/installer/deb/prerem.sh index 2b96768c..46d4e43f 100644 --- a/installer/deb/prerem.sh +++ b/installer/deb/prerem.sh @@ -1,2 +1,7 @@ #!/bin/sh + +# delete caches and logs +filebot -clear-cache + +# remove /bin symlink rm /usr/bin/filebot diff --git a/installer/ipkg/postinst.sh b/installer/ipkg/postinst.sh index bdaaf8b1..8542820f 100644 --- a/installer/ipkg/postinst.sh +++ b/installer/ipkg/postinst.sh @@ -1,2 +1,7 @@ #!/bin/sh + +# create /bin symlink ln -s /opt/usr/share/filebot/bin/filebot.sh /opt/usr/bin/filebot + +# delete caches and logs +filebot -clear-cache diff --git a/installer/ipkg/prerem.sh b/installer/ipkg/prerem.sh index f37f9c15..4cd85f67 100644 --- a/installer/ipkg/prerem.sh +++ b/installer/ipkg/prerem.sh @@ -1,2 +1,7 @@ #!/bin/sh + +# delete caches and logs +filebot -clear-cache + +# remove /bin symlink rm /opt/usr/bin/filebot diff --git a/installer/portable/filebot.sh b/installer/portable/filebot.sh index a14a5e0d..45ed583a 100644 --- a/installer/portable/filebot.sh +++ b/installer/portable/filebot.sh @@ -6,4 +6,4 @@ dir_bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )" # force JVM language and encoding settings export LANG=en_US.utf8 -java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=false -Dfile.encoding=UTF-8 -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=portable -Dapplication.analytics=true -Dapplication.warmup=false -Dnet.sourceforge.filebot.AcoustID.fpcalc=fpcalc "-Dapplication.dir=$dir_bin" "-Djava.io.tmpdir=$dir_bin/temp" "-Duser.home=$dir_bin" "-Djna.library.path=$dir_bin" "-Djava.library.path=$dir_bin" -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory "-Dnet.sourceforge.tuned.prefs.file=$dir_bin/prefs.properties" -jar "$dir_bin/FileBot.jar" "$@" +java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=false -DuseCreationDate=false -Dfile.encoding=UTF-8 -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=portable -Dapplication.analytics=true -Dapplication.warmup=false -Dnet.sourceforge.filebot.AcoustID.fpcalc=fpcalc "-Dapplication.dir=$dir_bin" "-Djava.io.tmpdir=$dir_bin/temp" "-Duser.home=$dir_bin" "-Djna.library.path=$dir_bin" "-Djava.library.path=$dir_bin" -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory "-Dnet.sourceforge.tuned.prefs.file=$dir_bin/prefs.properties" -jar "$dir_bin/FileBot.jar" "$@" diff --git a/installer/ubuntu/FileBot.desktop b/installer/ubuntu/FileBot.desktop index a591d4de..f569abea 100644 --- a/installer/ubuntu/FileBot.desktop +++ b/installer/ubuntu/FileBot.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=FileBot -Comment=Rename Movies and TV Shows +Comment=Rename Movies or TV Shows and download Subtitles Type=Application Exec=/opt/filebot/bin/filebot.sh Icon=filebot diff --git a/installer/ubuntu/filebot.sh b/installer/ubuntu/filebot.sh index 24617e6f..78317381 100644 --- a/installer/ubuntu/filebot.sh +++ b/installer/ubuntu/filebot.sh @@ -1,2 +1,2 @@ #!/bin/bash -java -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.update=skip -Dapplication.deployment=ppa -Dapplication.analytics=false -Dapplication.warmup=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/opt/filebot -Djava.library.path=/opt/filebot -Dnet.sourceforge.filebot.AcoustID.fpcalc=fpcalc -jar /opt/filebot/FileBot.jar "$@" \ No newline at end of file +java -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.update=skip -Dapplication.deployment=ppa -Dapplication.analytics=false -Dapplication.warmup=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/opt/filebot -Djava.library.path=/opt/filebot -Dnet.sourceforge.filebot.AcoustID.fpcalc=fpcalc -jar /opt/filebot/FileBot.jar "$@" \ No newline at end of file diff --git a/installer/webstart/filebot.jnlp b/installer/webstart/filebot.jnlp index c979d1e8..8202c96a 100644 --- a/installer/webstart/filebot.jnlp +++ b/installer/webstart/filebot.jnlp @@ -27,7 +27,8 @@ - + +