mirror of
https://github.com/mitb-archive/filebot
synced 2024-12-23 00:08:51 -05:00
* set -Djava.net.useSystemProxies=true for all deployment modes to automatically respect user-defined proxy settings of the OS
This commit is contained in:
Reinhard Pointner
parent
6c1024bf72
commit
16eca618f5
@ -209,8 +209,9 @@
|
||||
<javaproperty name="application.deployment" value="app" />
|
||||
<javaproperty name="unixfs" value="false" />
|
||||
<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 -->
|
||||
|
||||
@ -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" "$@"
|
||||
|
||||
@ -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 "$@"
|
||||
|
||||
@ -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 "$@"
|
||||
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 "$@"
|
||||
@ -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%"
|
||||
|
||||
@ -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%"
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
@ -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" %*
|
||||
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" %*
|
||||
@ -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" "$@"
|
||||
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" "$@"
|
||||
@ -24,10 +24,14 @@
|
||||
<resources>
|
||||
<property name="application.deployment" value="webstart" />
|
||||
<property name="application.update" value="skip" />
|
||||
<property name="useExtendedFileAttributes" value="true" />
|
||||
<property name="useNativeShell" value="false" />
|
||||
<property name="unixfs" value="false" />
|
||||
|
||||
<property name="useNativeShell" value="false" />
|
||||
<property name="useExtendedFileAttributes" value="true" />
|
||||
<property name="java.net.useSystemProxies" value="true" />
|
||||
<property name="sun.net.client.defaultConnectTimeout" value="10000" />
|
||||
<property name="sun.net.client.defaultReadTimeout" value="60000" />
|
||||
|
||||
|
||||
<java version="1.6+" max-heap-size="256m" />
|
||||
<property name="jnlp.packEnabled" value="true" />
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user