diff --git a/installer/appbundle/filebot.sh b/installer/appbundle/filebot.sh index bd27c7eb..6c8c45da 100644 --- a/installer/appbundle/filebot.sh +++ b/installer/appbundle/filebot.sh @@ -21,4 +21,4 @@ APP_ROOT=`cd "$PRG_DIR/../.." && pwd` cd "$WORKING_DIR" # start filebot -/usr/libexec/java_home --failfast --version '1.8+' --exec java $JAVA_OPTS -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapple.awt.UIElement=true -Djna.nounpack=true -Dapplication.deployment=app "-Djna.library.path=$APP_ROOT/Contents/MacOS" "-Djava.library.path=$APP_ROOT/Contents/MacOS" "-Dnet.filebot.AcoustID.fpcalc=$APP_ROOT/Contents/MacOS/fpcalc" -jar "$APP_ROOT"/Contents/Java/FileBot*.jar "$@" +/usr/libexec/java_home --failfast --version '1.8+' --exec java -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=true -Dapple.awt.UIElement=true -Djna.nounpack=true -Dapplication.deployment=app "-Djna.library.path=$APP_ROOT/Contents/MacOS" "-Djava.library.path=$APP_ROOT/Contents/MacOS" "-Dnet.filebot.AcoustID.fpcalc=$APP_ROOT/Contents/MacOS/fpcalc" $JAVA_OPTS -jar "$APP_ROOT"/Contents/Java/FileBot*.jar "$@" diff --git a/installer/deb/filebot.sh b/installer/deb/filebot.sh index 6a7b45a9..87353de6 100644 --- a/installer/deb/filebot.sh +++ b/installer/deb/filebot.sh @@ -13,13 +13,7 @@ else export LD_LIBRARY_PATH="$APP_ROOT" fi -# create application data folder +# select application data folder APP_DATA="$HOME/.filebot" -mkdir -p "$APP_DATA" -if [ ! -w "$APP_DATA" ]; then - echo "$APP_DATA must be set and writable" - exit 1 -fi - -java $JAVA_OPTS -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=deb "-Dapplication.dir=$APP_DATA" "-Djava.io.tmpdir=$APP_DATA/temp" "-Dnet.filebot.AcoustID.fpcalc=$APP_ROOT/fpcalc" -jar "$APP_ROOT/FileBot.jar" "$@" +java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Djna.nosys=true -Dapplication.deployment=deb "-Dapplication.dir=$APP_DATA" "-Djava.io.tmpdir=$APP_DATA/temp" "-Dnet.filebot.AcoustID.fpcalc=$APP_ROOT/fpcalc" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@" diff --git a/installer/ipkg/filebot.sh b/installer/ipkg/filebot.sh index c6f4d03e..6680fcba 100644 --- a/installer/ipkg/filebot.sh +++ b/installer/ipkg/filebot.sh @@ -22,14 +22,8 @@ EXTRACTOR="ApacheVFS" # use Apache Commons VFS2 with junrar plugin # EXTRACTOR="SevenZipExecutable" # use the 7z executable # EXTRACTOR="SevenZipNativeBindings" # use the lib7-Zip-JBinding.so native library -# create application data folder +# select application data folder APP_DATA="$APP_ROOT/data/$USER" -mkdir -p "$APP_DATA" -if [ ! -w "$APP_DATA" ]; then - echo "$APP_DATA must be set and writable" - exit 1 -fi - # start filebot -java $JAVA_OPTS -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=ipkg -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir="$APP_DATA" -Djava.io.tmpdir="$APP_DATA/temp" -Duser.home="$APP_DATA" -jar "$APP_ROOT/FileBot.jar" "$@" +java -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Dapplication.deployment=ipkg -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir="$APP_DATA" -Djava.io.tmpdir="$APP_DATA/temp" -Duser.home="$APP_DATA" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@" diff --git a/installer/msi/filebot.l4j.ini b/installer/msi/filebot.l4j.ini index ed933afa..d5dde233 100644 --- a/installer/msi/filebot.l4j.ini +++ b/installer/msi/filebot.l4j.ini @@ -7,8 +7,6 @@ # network settings -Djava.net.useSystemProxies=true --Dsun.net.client.defaultConnectTimeout=10000 --Dsun.net.client.defaultReadTimeout=60000 # use NTFS extended attributes for storing metadata -DuseExtendedFileAttributes=true diff --git a/installer/msi/filebot.launcher.l4j.ini b/installer/msi/filebot.launcher.l4j.ini index 02bb9004..7d79c3d0 100644 --- a/installer/msi/filebot.launcher.l4j.ini +++ b/installer/msi/filebot.launcher.l4j.ini @@ -7,8 +7,6 @@ # network settings -Djava.net.useSystemProxies=true --Dsun.net.client.defaultConnectTimeout=10000 --Dsun.net.client.defaultReadTimeout=60000 # use native shell for move/copy operations -DuseNativeShell=true diff --git a/installer/portable/filebot.cmd b/installer/portable/filebot.cmd index 3089f2f5..78c6ee18 100644 --- a/installer/portable/filebot.cmd +++ b/installer/portable/filebot.cmd @@ -1,2 +1,2 @@ @ECHO OFF -java -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=portable "-Dapplication.dir=%~dp0." "-Duser.home=%~dp0." "-Djava.io.tmpdir=%~dp0temp" "-Djna.library.path=%~dp0" "-Djava.library.path=%~dp0" "-Dnet.filebot.AcoustID.fpcalc=%~dp0fpcalc.exe" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory "-Dnet.filebot.util.prefs.file=%~dp0prefs.properties" -jar "%~dp0FileBot.jar" %* +java -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Djna.nosys=true -Dapplication.deployment=portable "-Dapplication.dir=%~dp0." "-Duser.home=%~dp0." "-Djava.io.tmpdir=%~dp0temp" "-Djna.library.path=%~dp0" "-Djava.library.path=%~dp0" "-Dnet.filebot.AcoustID.fpcalc=%~dp0fpcalc.exe" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory "-Dnet.filebot.util.prefs.file=%~dp0prefs.properties" -jar "%~dp0FileBot.jar" %* diff --git a/installer/portable/filebot.sh b/installer/portable/filebot.sh index 2d31b83c..6ae3f9de 100644 --- a/installer/portable/filebot.sh +++ b/installer/portable/filebot.sh @@ -46,14 +46,8 @@ EXTRACTOR="ApacheVFS" # use Apache Commons VFS2 with junrar plugin # EXTRACTOR="SevenZipExecutable" # use the 7z executable # EXTRACTOR="SevenZipNativeBindings" # use the lib7-Zip-JBinding.so native library -# create application data folder +# select application data folder APP_DATA="$APP_ROOT/data/$USER" -mkdir -p "$APP_DATA" -if [ ! -w "$APP_DATA" ]; then - echo "$APP_DATA must be set and writable" - exit 1 -fi - # start filebot -java $JAVA_OPTS -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djava.net.useSystemProxies=false -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=portable -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir="$APP_DATA" -Djava.io.tmpdir="$APP_DATA/temp" -Duser.home="$APP_DATA" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory -Dnet.filebot.util.prefs.file="$APP_DATA/prefs.properties" -jar "$APP_ROOT/FileBot.jar" "$@" +java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djava.net.useSystemProxies=false -Djna.nosys=true -Dapplication.deployment=portable -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir="$APP_DATA" -Djava.io.tmpdir="$APP_DATA/temp" -Duser.home="$APP_DATA" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory -Dnet.filebot.util.prefs.file="$APP_DATA/prefs.properties" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@" diff --git a/installer/spk/package/filebot.sh b/installer/spk/package/filebot.sh index 94170c06..e0e83f07 100644 --- a/installer/spk/package/filebot.sh +++ b/installer/spk/package/filebot.sh @@ -45,14 +45,8 @@ EXTRACTOR="ApacheVFS" # use Apache Commons VFS2 with junrar plugin # EXTRACTOR="SevenZipExecutable" # use the 7z executable # EXTRACTOR="SevenZipNativeBindings" # use the lib7-Zip-JBinding.so native library -# create application data folder +# select application data folder APP_DATA="$APP_ROOT/data/$USER" -mkdir -p "$APP_DATA" -if [ ! -w "$APP_DATA" ]; then - echo "$APP_DATA must be set and writable" - exit 1 -fi - # start filebot -java $JAVA_OPTS -Djava.awt.headless=true -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=spk -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="$SYNO_FPCALC" -Dapplication.dir="$APP_DATA" -Djava.io.tmpdir="$APP_DATA/temp" -Duser.home="$APP_DATA" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory -Dnet.filebot.util.prefs.file="$APP_DATA/prefs.properties" -jar "$APP_ROOT/FileBot.jar" "$@" +java -Djava.awt.headless=true -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djava.net.useSystemProxies=true -Djna.nosys=true -Dapplication.deployment=spk -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="$SYNO_FPCALC" -Dapplication.dir="$APP_DATA" -Djava.io.tmpdir="$APP_DATA/temp" -Duser.home="$APP_DATA" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory -Dnet.filebot.util.prefs.file="$APP_DATA/prefs.properties" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@" diff --git a/installer/ubuntu/filebot.sh b/installer/ubuntu/filebot.sh index d141ff47..1130117f 100644 --- a/installer/ubuntu/filebot.sh +++ b/installer/ubuntu/filebot.sh @@ -20,4 +20,4 @@ APP_CACHE="$HOME/.cache/FileBot" JAVA_CMD="$APP_ROOT/jre/bin/java" # start filebot -"$JAVA_CMD" $JAVA_OPTS -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dsun.java2d.xrender=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.update=skip -Dapplication.deployment=usc -Dnet.filebot.UserFiles.fileChooser=JavaFX "-Dapplication.dir=$APP_DATA" "-Dapplication.cache=$APP_CACHE/ehcache.disk.store" "-Djava.io.tmpdir=$APP_CACHE/java.io.tmpdir" "-Dnet.filebot.AcoustID.fpcalc=$APP_ROOT/fpcalc" -jar "$APP_ROOT/FileBot.jar" "$@" +"$JAVA_CMD" -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dsun.java2d.xrender=true -Djava.net.useSystemProxies=true -Djna.nosys=true -Dapplication.update=skip -Dapplication.deployment=usc -Dnet.filebot.UserFiles.fileChooser=JavaFX "-Dapplication.dir=$APP_DATA" "-Dapplication.cache=$APP_CACHE/ehcache.disk.store" "-Djava.io.tmpdir=$APP_CACHE/java.io.tmpdir" "-Dnet.filebot.AcoustID.fpcalc=$APP_ROOT/fpcalc" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@"