diff --git a/build.xml b/build.xml index c646d08c..4d85f52c 100644 --- a/build.xml +++ b/build.xml @@ -209,8 +209,9 @@ + - + diff --git a/installer/appbundle/filebot b/installer/appbundle/filebot index 86e75f58..73220d7d 100644 --- a/installer/appbundle/filebot +++ b/installer/appbundle/filebot @@ -4,4 +4,4 @@ while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done dir_bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )" dir_app=$dir_bin/../Resources/Java -java -Xmx256m -Djava.awt.headless=true -Dunixfs=false -DuseExtendedFileAttributes=true -Dapplication.deployment=app "-Djna.library.path=$dir_app" "-Djava.library.path=$dir_app" -Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=25000 -jar "$dir_app/FileBot.jar" "$@" +java -Xmx256m -Djava.awt.headless=true -Dunixfs=false -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=app "-Djna.library.path=$dir_app" "-Djava.library.path=$dir_app" -jar "$dir_app/FileBot.jar" "$@" diff --git a/installer/deb/filebot.sh b/installer/deb/filebot.sh index 6ed20d00..fb247606 100644 --- a/installer/deb/filebot.sh +++ b/installer/deb/filebot.sh @@ -1,2 +1,2 @@ #!/bin/bash -java -Xmx256m -Dunixfs=false -DuseExtendedFileAttributes=true -Dapplication.deployment=deb -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -jar /usr/share/filebot/FileBot.jar "$@" +java -Xmx256m -Dunixfs=false -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=deb -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 "$@" diff --git a/installer/ipkg/filebot.sh b/installer/ipkg/filebot.sh index 8051e24b..8be998d6 100644 --- a/installer/ipkg/filebot.sh +++ b/installer/ipkg/filebot.sh @@ -1,2 +1,2 @@ #!/bin/sh -java -Dunixfs=false -DuseExtendedFileAttributes=true -Dapplication.deployment=ipkg -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -jar /usr/share/filebot/FileBot.jar "$@" \ No newline at end of file +java -Dunixfs=false -DuseExtendedFileAttributes=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=ipkg -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 diff --git a/installer/msi/filebot.launcher.l4j.ini b/installer/msi/filebot.launcher.l4j.ini index a6848e2c..81b8c8f1 100644 --- a/installer/msi/filebot.launcher.l4j.ini +++ b/installer/msi/filebot.launcher.l4j.ini @@ -2,9 +2,10 @@ -Dapplication.deployment=msi -Dapplication.dir="%APPDATA%\FileBot" -# proxy settings -# -Dhttp.proxyHost=localhost -# -Dhttp.proxyPort=8888 +# network settings +-Djava.net.useSystemProxies=true +-Dsun.net.client.defaultConnectTimeout=10000 +-Dsun.net.client.defaultReadTimeout=60000 # disable analytics # -no-analytics @@ -18,10 +19,6 @@ # memory settings -Xmx256m -# http connection timeouts --Dsun.net.client.defaultConnectTimeout=10000 --Dsun.net.client.defaultReadTimeout=60000 - # look for native libs here -Djna.library.path="%EXEDIR%" -Djava.library.path="%EXEDIR%" diff --git a/installer/msi/filebot.platform.launcher.l4j.ini b/installer/msi/filebot.platform.launcher.l4j.ini index 96fdee80..d26f13a2 100644 --- a/installer/msi/filebot.platform.launcher.l4j.ini +++ b/installer/msi/filebot.platform.launcher.l4j.ini @@ -6,9 +6,10 @@ -DthreadPool=8 -Dunixfs=false -# proxy settings -# -Dhttp.proxyHost=localhost -# -Dhttp.proxyPort=8888 +# network settings +-Djava.net.useSystemProxies=true +-Dsun.net.client.defaultConnectTimeout=10000 +-Dsun.net.client.defaultReadTimeout=60000 # disable analytics # -no-analytics @@ -23,10 +24,6 @@ -Xms64m -Xmx512m -# http connection timeouts --Dsun.net.client.defaultConnectTimeout=10000 --Dsun.net.client.defaultReadTimeout=60000 - # look for native libs here -Djna.library.path="%EXEDIR%" -Djava.library.path="%EXEDIR%" diff --git a/installer/portable/FileBot.l4j.ini b/installer/portable/FileBot.l4j.ini index 7c3bea9b..b7a12a3b 100644 --- a/installer/portable/FileBot.l4j.ini +++ b/installer/portable/FileBot.l4j.ini @@ -3,9 +3,10 @@ -Dapplication.dir="%EXEDIR%" -Duser.home="%EXEDIR%" -# proxy settings -# -Dhttp.proxyHost=localhost -# -Dhttp.proxyPort=8888 +# network settings +-Djava.net.useSystemProxies=true +-Dsun.net.client.defaultConnectTimeout=10000 +-Dsun.net.client.defaultReadTimeout=60000 # disable analytics # -no-analytics @@ -19,10 +20,6 @@ # memory settings -Xmx256m -# http connection timeouts --Dsun.net.client.defaultConnectTimeout=10000 --Dsun.net.client.defaultReadTimeout=60000 - # put all temporary files here -Djava.io.tmpdir="%EXEDIR%/temp" diff --git a/installer/portable/filebot.cmd b/installer/portable/filebot.cmd index 7c298bca..63ef19ca 100644 --- a/installer/portable/filebot.cmd +++ b/installer/portable/filebot.cmd @@ -1,2 +1,2 @@ @ECHO OFF -java -Xmx256m -Dapplication.deployment=portable "-Dapplication.dir=%~dp0." "-Duser.home=%~dp0." "-Djava.io.tmpdir=%~dp0temp" "-Djna.library.path=%~dp0." "-Djava.library.path=%~dp0." -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory "-Dnet.sourceforge.tuned.prefs.file=%~dp0prefs.properties" -jar "%~dp0FileBot.jar" %* \ No newline at end of file +java -Xmx256m -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=portable "-Dapplication.dir=%~dp0." "-Duser.home=%~dp0." "-Djava.io.tmpdir=%~dp0temp" "-Djna.library.path=%~dp0." "-Djava.library.path=%~dp0." -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory "-Dnet.sourceforge.tuned.prefs.file=%~dp0prefs.properties" -jar "%~dp0FileBot.jar" %* \ No newline at end of file diff --git a/installer/portable/filebot.sh b/installer/portable/filebot.sh index 33e28975..b1dc7583 100644 --- a/installer/portable/filebot.sh +++ b/installer/portable/filebot.sh @@ -3,4 +3,4 @@ SOURCE="${BASH_SOURCE[0]}" while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done dir_bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )" -java -Xmx256m -Dunixfs=false -DuseExtendedFileAttributes=true -Dapplication.deployment=portable "-Dapplication.dir=$dir_bin" "-Djava.io.tmpdir=$dir_bin/temp" "-Duser.home=$dir_bin" "-Djna.library.path=$dir_bin" "-Djava.library.path=$dir_bin" -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory -Dnet.sourceforge.tuned.prefs.file=prefs.properties -jar "$dir_bin/FileBot.jar" "$@" \ No newline at end of file +java -Xmx256m -Dunixfs=false -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=portable "-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=prefs.properties -jar "$dir_bin/FileBot.jar" "$@" \ No newline at end of file diff --git a/installer/webstart/filebot.jnlp b/installer/webstart/filebot.jnlp index 629d4c27..7c2b6e55 100644 --- a/installer/webstart/filebot.jnlp +++ b/installer/webstart/filebot.jnlp @@ -24,10 +24,14 @@ - - - + + + + + + +