switch to classic confinment (still broken though)
This commit is contained in:
parent
fdfa4a57c4
commit
63099d98b6
27
build.xml
27
build.xml
|
@ -99,9 +99,8 @@
|
|||
<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}_osx-x64_bin.tar.gz" dest="@{dest}" compression="gzip">
|
||||
<!-- MAS validation does not like certain files included in the JRE -->
|
||||
<patternset>
|
||||
<exclude name="**/deploy/**" />
|
||||
<exclude name="**/nibs/**" />
|
||||
|
@ -120,8 +119,6 @@
|
|||
<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>
|
||||
|
@ -488,30 +485,24 @@
|
|||
<property name="dir.staging" location="${dir.dist}/snap" />
|
||||
<property name="dir.root" location="${dir.staging}/root" />
|
||||
|
||||
<get-linux-jre dest="${dir.root}/usr/lib/jre" />
|
||||
<get-linux-jre dest="${dir.root}/jre" />
|
||||
|
||||
<!-- copy files and resolve ant variables -->
|
||||
<copy-replace todir="${dir.staging}">
|
||||
<fileset dir="${dir.installer}/snap" />
|
||||
</copy-replace>
|
||||
<chmod perm="+x" verbose="yes">
|
||||
<fileset dir="${dir.root}" includes="**/bin/**" />
|
||||
</chmod>
|
||||
|
||||
<copy todir="${dir.root}/usr/lib/filebot/jar">
|
||||
<copy todir="${dir.root}/filebot/jar">
|
||||
<fileset dir="${dir.dist}/lib" includes="*.jar" />
|
||||
</copy>
|
||||
|
||||
<!-- include native binaries that are not available via apt -->
|
||||
<copy todir="${dir.root}/usr/lib/filebot/lib">
|
||||
<fileset dir="${dir.lib}/native/linux-amd64">
|
||||
<include name="*.so" />
|
||||
</fileset>
|
||||
<copy todir="${dir.root}/filebot/lib">
|
||||
<fileset dir="${dir.lib}/native/linux-amd64" />
|
||||
</copy>
|
||||
<chmod perm="+x" verbose="yes">
|
||||
<fileset dir="${dir.root}" includes="**/bin/**" />
|
||||
<fileset dir="${dir.root}" includes="**/fpcalc" />
|
||||
</chmod>
|
||||
|
||||
<exec executable="snapcraft" dir="${dir.staging}" failonerror="yes">
|
||||
<arg line="cleanbuild" />
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
|
||||
|
|
|
@ -1,13 +1,8 @@
|
|||
#!/bin/sh
|
||||
export LANG="C.UTF-8"
|
||||
export LC_ALL="C.UTF-8"
|
||||
|
||||
export JAVA_HOME="$SNAP/usr/lib/jre"
|
||||
export PATH="$JAVA_HOME/jre/bin:$PATH"
|
||||
export LD_LIBRARY_PATH="$SNAP/usr/lib/filebot/lib:$LD_LIBRARY_PATH"
|
||||
export APP_ROOT="$SNAP/filebot"
|
||||
|
||||
export APP_DATA="$SNAP_USER_DATA/data"
|
||||
export APP_CACHE="$SNAP_USER_DATA/cache"
|
||||
export APP_PREFS="$SNAP_USER_DATA/prefs"
|
||||
|
||||
"$JAVA_HOME/bin/java" @{java.application.options} -Dapplication.deployment=snap -Dapplication.update=skip -Dapplication.help=show -Djava.library.path="$LD_LIBRARY_PATH" -Djna.library.path="$LD_LIBRARY_PATH" -Djna.boot.library.path="$LD_LIBRARY_PATH" -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -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} "$@"
|
||||
"$SNAP/jre/bin/java" -Djdk.gtk.version=2 @{java.application.options} -Dapplication.deployment=snap -Dapplication.update=skip -Dapplication.help=show -Djava.library.path="$APP_ROOT/lib" -Djna.library.path="$APP_ROOT/lib" -Djna.boot.library.path="$APP_ROOT/lib" -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -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="$APP_ROOT/lib/fpcalc" $JAVA_OPTS -classpath "$APP_ROOT/jar/*" @{main.class} "$@"
|
||||
|
|
|
@ -3,25 +3,16 @@ version: @{application.version}
|
|||
summary: @{package.synopsis}
|
||||
description: @{package.description}
|
||||
|
||||
confinement: strict
|
||||
confinement: classic
|
||||
grade: stable
|
||||
|
||||
architectures: [amd64]
|
||||
|
||||
apps:
|
||||
filebot:
|
||||
command: bin/desktop-launch $SNAP/bin/filebot.sh
|
||||
plugs: [unity7, opengl, x11, home, removable-media, network, network-bind, pulseaudio, gsettings]
|
||||
command: bin/filebot.sh
|
||||
|
||||
parts:
|
||||
filebot:
|
||||
plugin: dump
|
||||
source: root
|
||||
stage-packages:
|
||||
- libmediainfo0v5
|
||||
- libchromaprint-tools
|
||||
- curl
|
||||
- openjdk-8-jre
|
||||
- openjfx
|
||||
after:
|
||||
- desktop-gtk2
|
||||
|
|
Loading…
Reference in New Issue