1
0
mirror of https://github.com/mitb-archive/filebot synced 2025-01-08 12:28:04 -05:00

Update snap package (still broken though)

This commit is contained in:
Reinhard Pointner 2018-06-13 04:59:52 +07:00
parent f4acb0ba7e
commit f299b43fa6
4 changed files with 29 additions and 35 deletions

View File

@ -115,7 +115,18 @@
</sequential>
</macrodef>
<!-- fetch and unpack JRE bundle (64-bit Linux) -->
<macrodef name="get-linux-jre">
<attribute name="dest" />
<sequential>
<exec executable="get-java.sh" dir="${dir.cache}" failonerror="yes" />
<!-- MAS validation does not like certain files included in the JRE -->
<untar src="${dir.cache}/jre-${jre.version}_linux-x64_bin.tar.gz" dest="@{dest}" compression="gzip">
<cutdirsmapper dirs="1" />
</untar>
</sequential>
</macrodef>
<target name="resolve" description="Retrieve dependencies with Apache Ivy">
@ -635,25 +646,28 @@
</tar>
</target>
<target name="snap" depends="revision">
<copy todir="${dir.dist}/snap/filebot/usr/lib/filebot/java">
<property name="dir.staging" location="${dir.dist}/snap" />
<get-linux-jre dest="${dir.staging}/filebot/usr/lib/jre" />
<!-- copy files and resolve ant variables -->
<copy-replace todir="${dir.staging}">
<fileset dir="${dir.installer}/snap" />
</copy-replace>
<chmod perm="+x" file="${dir.staging}/filebot/filebot.sh" />
<copy todir="${dir.staging}/filebot/usr/lib/filebot/jar">
<fileset dir="${dir.dist}/lib" includes="*.jar" />
</copy>
<!-- include native binaries that are not available via apt -->
<copy todir="${dir.dist}/snap/filebot/usr/lib/filebot/amd64">
<copy todir="${dir.dist}/filebot/usr/lib/filebot/amd64">
<fileset dir="${dir.lib}/native/linux-amd64" includes="libjnidispatch.so, lib7-Zip-JBinding.so" />
</copy>
<!-- copy files and resolve ant variables -->
<copy-replace todir="${dir.dist}/snap">
<fileset dir="${dir.installer}/snap" />
</copy-replace>
<chmod perm="+x" file="${dir.dist}/snap/filebot/filebot.sh" />
<exec executable="snapcraft" dir="${dir.dist}/snap" failonerror="yes">
<exec executable="snapcraft" dir="${dir.staging}" failonerror="yes">
<arg line="snap" />
</exec>
</target>

View File

@ -10,4 +10,4 @@ export APP_DATA="$SNAP_USER_DATA/data"
export APP_CACHE="$SNAP_USER_DATA/cache"
export APP_PREFS="$SNAP_USER_DATA/prefs"
java @{java.application.options} -Dapplication.deployment=snap -Dapplication.update=skip -Djava.library.path="$LD_LIBRARY_PATH" -Djna.library.path="$LD_LIBRARY_PATH" -Djna.boot.library.path="$SNAP/usr/lib/filebot/$SNAP_ARCH" -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dnet.filebot.UserFiles.fileChooser=JavaFX -DuseGVFS=true -Dnet.filebot.gio.GVFS="/run/user/$(id -u)/gvfs" -Duser.home="$SNAP_USER_DATA" -Dapplication.dir="$APP_DATA" -Dapplication.cache="$APP_CACHE/ehcache.disk.store" -Djava.io.tmpdir="$APP_CACHE/java.io.tmpdir" -Djava.util.prefs.userRoot="$APP_PREFS/user" -Djava.util.prefs.systemRoot="$APP_PREFS/system" -Dnet.filebot.AcoustID.fpcalc="$SNAP/usr/bin/fpcalc" $JAVA_OPTS -classpath "$SNAP/usr/lib/filebot/java/*" @{main.class} "$@"
java @{java.application.options} -Dapplication.deployment=snap -Dapplication.update=skip -Djava.library.path="$LD_LIBRARY_PATH" -Djna.library.path="$LD_LIBRARY_PATH" -Djna.boot.library.path="$SNAP/usr/lib/filebot/$SNAP_ARCH" -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dnet.filebot.UserFiles.fileChooser=JavaFX -DuseGVFS=true -Dnet.filebot.gio.GVFS="/run/user/$(id -u)/gvfs" -Duser.home="$SNAP_USER_DATA" -Dapplication.dir="$APP_DATA" -Dapplication.cache="$APP_CACHE/ehcache.disk.store" -Djava.io.tmpdir="$APP_CACHE/java.io.tmpdir" -Djava.util.prefs.userRoot="$APP_PREFS/user" -Djava.util.prefs.systemRoot="$APP_PREFS/system" -Dnet.filebot.AcoustID.fpcalc="$SNAP/usr/bin/fpcalc" $JAVA_OPTS -classpath "$SNAP/usr/lib/filebot/jar/*" @{main.class} "$@"

View File

@ -10,18 +10,3 @@ Actions=Rename;Subtitles;Checksum;
StartupNotify=true
StartupWMClass=@{deb.application.class}
X-Ubuntu-Gettext-Domain=@{package.name}
[Desktop Action Rename]
Name=Rename
Exec=filebot --mode Rename %F
OnlyShowIn=Unity;
[Desktop Action Subtitles]
Name=Subtitles
Exec=filebot --mode Subtitles %F
OnlyShowIn=Unity;
[Desktop Action Checksum]
Name=Checksum
Exec=filebot --mode SFV %F
OnlyShowIn=Unity;

View File

@ -3,7 +3,7 @@ version: @{application.version}
summary: @{package.synopsis}
description: @{package.description}
confinement: strict
confinement: classic
grade: stable
architectures: [amd64]
@ -15,12 +15,7 @@ apps:
parts:
filebot:
after: [desktop-gtk2]
plugin: dump
source: filebot
java:
plugin: nil
stage-packages: [openjdk-8-jre, openjfx, jayatana]
after: [desktop-gtk2]
native:
plugin: nil
stage-packages: [libmediainfo0v5, libchromaprint-tools, curl]
stage-packages: [libc6, libmediainfo0v5, libchromaprint-tools, curl]