[DEB] Depend on various standard Debian packages instead of bundling binaries (JRE, OpenJFX, fpcalc, 7z, etc)

This commit is contained in:
Reinhard Pointner 2018-11-20 18:13:31 +07:00
parent 0d4f09a362
commit 01ffea81c7
3 changed files with 4 additions and 8 deletions

View File

@ -68,7 +68,7 @@ mac.application.category: public.app-category.utilities
deb.application.categories: AudioVideo;Video;Utility;FileTools;
deb.application.mimetype: inode/directory;video/*;audio/*;text/*;application/*;
deb.application.class: net-filebot-Main
deb.application.depends: openjdk-11-jre, openjfx, xdg-utils, ffmpeg, mediainfo, libchromaprint-tools
deb.application.depends: openjdk-11-jre, openjfx, mediainfo, libchromaprint-tools, p7zip-full, p7zip-rar
# Package Options
tar.compression: xz

View File

@ -539,13 +539,10 @@
</copy-replace>
<jdeb destfile="${dir.dist}/${application.name}_${application.version}_amd64.deb" control="${dir.staging}/control" compression="${tar.compression}" verbose="true">
<tarfileset prefix="/usr/share/filebot/jre" dir="${dir.staging}/jre" includes="**/bin/**" filemode="755" />
<tarfileset prefix="/usr/share/filebot/jre" dir="${dir.staging}/jre" excludes="**/bin/**" />
<tarfileset prefix="/usr/share/filebot/bin" dir="${dir.staging}" includes="*.sh" filemode="755" />
<tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" />
<tarfileset prefix="/usr/share/filebot/lib" dir="${dir.lib}/native/linux-amd64" includes="fpcalc" filemode="755" />
<tarfileset prefix="/usr/share/filebot/lib" dir="${dir.lib}/native/linux-amd64" includes="*.so" />
<tarfileset prefix="/usr/share/filebot/lib" dir="${dir.lib}/native/linux-amd64" includes="libjnidispatch.so" />
<tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" />
<tarfileset prefix="/usr/share" dir="${dir.staging}/share" />

View File

@ -1,6 +1,5 @@
#!/bin/sh
FILEBOT_HOME="/usr/share/filebot"
JAVA_HOME="$FILEBOT_HOME/jre"
if [ -z "$HOME" ]; then
echo '$HOME must be set'
@ -11,4 +10,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 -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"
java -Dapplication.deployment=deb -Dnet.filebot.Archive.extractor=SevenZipExecutable @{java.application.options} @{linux.application.options} @{linux.desktop.application.options} $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"