From 0c3d4b73066d21636806ce3a22db284d399aae4a Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Thu, 28 Jun 2018 01:50:58 +0700 Subject: [PATCH] -jar "$FILEBOT_HOME/jar/filebot.jar" --- installer/app/filebot.sh | 2 +- installer/deb/filebot.sh | 2 +- installer/pkg/filebot.sh | 2 +- installer/snap/base/bin/filebot.sh | 2 +- installer/spk/package/filebot.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/installer/app/filebot.sh b/installer/app/filebot.sh index 1a7710ba..5291b91d 100755 --- a/installer/app/filebot.sh +++ b/installer/app/filebot.sh @@ -21,4 +21,4 @@ APP_DATA="$HOME/.filebot" LIBRARY_PATH="$FILEBOT_HOME/MacOS" # start filebot -/usr/libexec/java_home --failfast --version "@{jvm.version}+" --exec java -Dapplication.deployment=app -Dapple.awt.UIElement=true -Dnet.filebot.AcoustID.fpcalc="$LIBRARY_PATH/fpcalc" @{java.application.options} @{linux.application.options} $JAVA_OPTS $FILEBOT_OPTS -classpath "$FILEBOT_HOME/Java/*" @{main.class} "$@" +/usr/libexec/java_home --failfast --version "@{jvm.version}+" --exec java -Dapplication.deployment=app -Dapple.awt.UIElement=true -Dnet.filebot.AcoustID.fpcalc="$LIBRARY_PATH/fpcalc" @{java.application.options} @{linux.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/Java/filebot.jar" "$@" diff --git a/installer/deb/filebot.sh b/installer/deb/filebot.sh index f87f07a9..9b48e614 100644 --- a/installer/deb/filebot.sh +++ b/installer/deb/filebot.sh @@ -11,4 +11,4 @@ fi APP_DATA="$HOME/.filebot" LIBRARY_PATH="$FILEBOT_HOME/lib" -"$JAVA_HOME/bin/java" -Dapplication.deployment=deb -Dnet.filebot.AcoustID.fpcalc="$LIBRARY_PATH/fpcalc" @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} $JAVA_OPTS $FILEBOT_OPTS -classpath "$FILEBOT_HOME/jar/*" @{main.class} "$@" +"$JAVA_HOME/bin/java" -Dapplication.deployment=deb -Dnet.filebot.AcoustID.fpcalc="$LIBRARY_PATH/fpcalc" @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@" diff --git a/installer/pkg/filebot.sh b/installer/pkg/filebot.sh index 6683beab..1472d359 100755 --- a/installer/pkg/filebot.sh +++ b/installer/pkg/filebot.sh @@ -7,4 +7,4 @@ APP_DATA="$HOME/.filebot" LIBRARY_PATH="$FILEBOT_HOME/MacOS" # start filebot -"$JAVA_HOME/bin/java" -Dapplication.deployment=pkg -Dapple.awt.UIElement=true -Dnet.filebot.AcoustID.fpcalc="$LIBRARY_PATH/fpcalc" @{java.application.options} @{linux.application.options} $JAVA_OPTS $FILEBOT_OPTS -classpath "$FILEBOT_HOME/Java/*" @{main.class} "$@" +"$JAVA_HOME/bin/java" -Dapplication.deployment=pkg -Dapple.awt.UIElement=true -Dnet.filebot.AcoustID.fpcalc="$LIBRARY_PATH/fpcalc" @{java.application.options} @{linux.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/Java/filebot.jar" "$@" diff --git a/installer/snap/base/bin/filebot.sh b/installer/snap/base/bin/filebot.sh index fd576821..a4d8ea4a 100755 --- a/installer/snap/base/bin/filebot.sh +++ b/installer/snap/base/bin/filebot.sh @@ -8,4 +8,4 @@ export FILEBOT_HOME="$SNAP/filebot" APP_DATA="$SNAP_USER_DATA/data" LIBRARY_PATH="$FILEBOT_HOME/lib" -"$JAVA_HOME/bin/java" -Dapplication.deployment=snap -Dapplication.update=skip -Dnet.filebot.AcoustID.fpcalc="$SNAP/usr/bin/fpcalc" -Duser.home="$SNAP_USER_DATA" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory -Dnet.filebot.util.prefs.file="$APP_DATA/prefs.properties" @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} $JAVA_OPTS $FILEBOT_OPTS -classpath "$FILEBOT_HOME/jar/*" @{main.class} "$@" +"$JAVA_HOME/bin/java" -Dapplication.deployment=snap -Dapplication.update=skip -Dnet.filebot.AcoustID.fpcalc="$SNAP/usr/bin/fpcalc" -Duser.home="$SNAP_USER_DATA" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory -Dnet.filebot.util.prefs.file="$APP_DATA/prefs.properties" @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@" diff --git a/installer/spk/package/filebot.sh b/installer/spk/package/filebot.sh index f824da69..7d35e360 100644 --- a/installer/spk/package/filebot.sh +++ b/installer/spk/package/filebot.sh @@ -62,4 +62,4 @@ APP_DATA="$FILEBOT_HOME/data/$USER" LIBRARY_PATH="$SYNO_LIBRARY_PATH:$PACKAGE_LIBRARY_PATH" # start filebot -java -Dapplication.deployment=spk -Dnet.filebot.media.parser="$MEDIA_PARSER" -Dnet.filebot.media.ffprobe="$FFPROBE" -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory -Dnet.filebot.util.prefs.file="$APP_DATA/prefs.properties" @{java.application.options} @{linux.application.options} @{linux.headless.application.options} $JAVA_OPTS $FILEBOT_OPTS -classpath "$FILEBOT_HOME/jar/*" @{main.class} "$@" +java -Dapplication.deployment=spk -Dnet.filebot.media.parser="$MEDIA_PARSER" -Dnet.filebot.media.ffprobe="$FFPROBE" -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory -Dnet.filebot.util.prefs.file="$APP_DATA/prefs.properties" @{java.application.options} @{linux.application.options} @{linux.headless.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"