From a7e67974a232f57ab52c28458f237ad5867b3612 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Tue, 29 Jul 2014 06:52:25 +0000 Subject: [PATCH] * depricated options --- installer/portable/filebot.sh | 2 +- installer/ubuntu/filebot.sh | 2 +- source/net/filebot/Settings.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/installer/portable/filebot.sh b/installer/portable/filebot.sh index f076d0e6..714103e6 100644 --- a/installer/portable/filebot.sh +++ b/installer/portable/filebot.sh @@ -24,4 +24,4 @@ cd "$WORKING_DIR" # force JVM language and encoding settings export LANG=en_US.utf8 -java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding=UTF-8 -Djava.net.useSystemProxies=false -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=portable -Dapplication.analytics=true -Dapplication.warmup=false -Dnet.filebot.AcoustID.fpcalc=fpcalc "-Dapplication.dir=$APP_ROOT" "-Djava.io.tmpdir=$APP_ROOT/temp" "-Duser.home=$APP_ROOT" "-Djna.library.path=$APP_ROOT" "-Djava.library.path=$APP_ROOT" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory "-Dnet.filebot.util.prefs.file=$APP_ROOT/prefs.properties" -jar "$APP_ROOT/FileBot.jar" "$@" \ No newline at end of file +java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding=UTF-8 -Djava.net.useSystemProxies=false -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=portable -Dapplication.analytics=true -Dnet.filebot.AcoustID.fpcalc=fpcalc "-Dapplication.dir=$APP_ROOT" "-Djava.io.tmpdir=$APP_ROOT/temp" "-Duser.home=$APP_ROOT" "-Djna.library.path=$APP_ROOT" "-Djava.library.path=$APP_ROOT" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory "-Dnet.filebot.util.prefs.file=$APP_ROOT/prefs.properties" -jar "$APP_ROOT/FileBot.jar" "$@" \ No newline at end of file diff --git a/installer/ubuntu/filebot.sh b/installer/ubuntu/filebot.sh index 5576f8f6..8602d1fd 100644 --- a/installer/ubuntu/filebot.sh +++ b/installer/ubuntu/filebot.sh @@ -1,2 +1,2 @@ #!/bin/bash -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.filebot.AcoustID.fpcalc=fpcalc -jar /opt/filebot/FileBot.jar "$@" +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=usc -Dapplication.analytics=false -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/opt/filebot -Djava.library.path=/opt/filebot -Dnet.filebot.AcoustID.fpcalc=fpcalc -jar /opt/filebot/FileBot.jar "$@" diff --git a/source/net/filebot/Settings.java b/source/net/filebot/Settings.java index b1b3c8e2..ac6f7823 100644 --- a/source/net/filebot/Settings.java +++ b/source/net/filebot/Settings.java @@ -60,7 +60,7 @@ public final class Settings { } public static boolean useDonationReminder() { - return !("ppa".equals(getApplicationDeployment()) || "mas".equals(getApplicationDeployment())); + return !("mas".equals(getApplicationDeployment()) || "usc".equals(getApplicationDeployment())); } public static boolean isSandboxed() {