moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-01-08 12:28:04 -05:00
Code Issues Releases Wiki Activity

Update snap build

Browse Source
This commit is contained in:
Reinhard Pointner 2017-03-24 00:01:57 +08:00
parent d1927cd52d
commit 46bb9bbb5d
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.xml
View File

@ -517,22 +517,22 @@
<target name="snap" depends="revision">
<copy todir="${dir.dist}/snappy/filebot/lib">
<copy todir="${dir.dist}/snap/filebot/usr/lib/filebot/java">
<fileset dir="${dir.dist}/lib" includes="*.jar" />
</copy>
<!-- include native binaries that are not available via apt -->
<copy todir="${dir.dist}/snappy/filebot">
<copy todir="${dir.dist}/snap/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}/snappy">
<copy-replace todir="${dir.dist}/snap">
<fileset dir="${dir.installer}/snappy" />
</copy-replace>
<chmod perm="+x" file="${dir.dist}/snappy/filebot/filebot.sh" verbose="yes" />
<chmod perm="+x" file="${dir.dist}/snap/filebot/filebot.sh" />
<exec executable="snapcraft" dir="${dir.dist}/snappy" failonerror="yes">
<exec executable="snapcraft" dir="${dir.dist}/snap" failonerror="yes">
<arg line="snap" />
</exec>
</target>

5
installer/snappy/filebot/filebot.sh
View File

@ -4,11 +4,10 @@ export LC_ALL="en_US.UTF-8"
export JAVA_HOME="$SNAP/usr/lib/jvm/java-8-openjdk-$SNAP_ARCH"
export PATH="$JAVA_HOME/jre/bin:$PATH"
export LD_LIBRARY_PATH="$SNAP:$LD_LIBRARY_PATH"
export LD_LIBRARY_PATH="$SNAP/usr/lib/filebot/$SNAP_ARCH:$LD_LIBRARY_PATH"
export APP_ROOT="$SNAP"
export APP_DATA="$SNAP_USER_DATA/data"
export APP_CACHE="$SNAP_USER_DATA/cache"
export APP_PREFS="$SNAP_USER_DATA/prefs"
java -Duser.home="$SNAP_USER_DATA" -Djava.library.path="$LD_LIBRARY_PATH" -Djna.library.path="$LD_LIBRARY_PATH" -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Djava.net.useSystemProxies=true -Dapplication.update=skip -Dapplication.deployment=snap -Dnet.filebot.UserFiles.fileChooser=JavaFX -Dnet.filebot.gio.GVFS="/run/user/`id -u`/gvfs" -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 -cp "$APP_ROOT/lib/*" net.filebot.Main "$@"
java -Duser.home="$SNAP_USER_DATA" -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.library.path="$LD_LIBRARY_PATH" -Djna.library.path="$LD_LIBRARY_PATH" -Djna.boot.library.path="$SNAP/usr/lib/filebot/$SNAP_ARCH" -Djna.nosys=true -Djna.nounpack=true -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Djava.net.useSystemProxies=true -Dapplication.update=skip -Dapplication.deployment=snap -Dnet.filebot.UserFiles.fileChooser=JavaFX -Dnet.filebot.gio.GVFS="/run/user/$(id -u)/gvfs" -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 -cp "$SNAP/usr/lib/filebot/java/*" net.filebot.Main "$@"