mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor GVFS (don't require libgio)

This commit is contained in:
Reinhard Pointner 2016-07-12 00:20:15 +08:00
parent 8116b53018
commit bd4c692a17
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
installer/snappy/filebot.sh
View File

@ -35,15 +35,6 @@ export LIBGL_DRIVERS_PATH=$SNAP/usr/lib/$ARCH/dri
export JAVA_OPTS=-Dsun.java2d.xrender=True export JAVA_OPTS=-Dsun.java2d.xrender=True
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
# Set XDG_DATA_HOME to local path, dependent on snap version # Set XDG_DATA_HOME to local path, dependent on snap version
export XDG_DATA_HOME=$SNAP_USER_DATA/XDG/data-$SNAP_VERSION export XDG_DATA_HOME=$SNAP_USER_DATA/XDG/data-$SNAP_VERSION
export XDG_DATA_DIRS=$XDG_DATA_HOME:$XDG_DATA_DIRS export XDG_DATA_DIRS=$XDG_DATA_HOME:$XDG_DATA_DIRS
@ -114,8 +105,9 @@ if [ ! -d $XDG_DATA_HOME/icons ]; then
done done
fi fi
export APP_ROOT="$SNAP/filebot"
export APP_DATA="$SNAP_COMMON/data"
export APP_CACHE="$SNAP_USER_DATA/cache"
export APP_PREFS="$SNAP_USER_COMMON/prefs"
cd "$SNAP_USER_DATA" java -Duser.home="$SNAP_COMMON" -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=usc -Dnet.filebot.UserFiles.fileChooser=JavaFX -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 -jar "$APP_ROOT/FileBot.jar" "$@"
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=usc -Dnet.filebot.UserFiles.fileChooser=JavaFX -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 -jar "$APP_ROOT/FileBot.jar" "$@"

5
installer/snappy/snapcraft.yaml
View File

@ -10,7 +10,7 @@ architectures: [amd64]
apps: apps:
filebot: filebot:
command: bin/filebot command: bin/filebot
plugs: [home, network, network-bind, unity7, gsettings, opengl, pulseaudio] plugs: [home, network, network-bind, unity7, x11, opengl, pulseaudio]
parts: parts:
filebot: filebot:
@ -19,10 +19,12 @@ parts:
filebot.sh: bin/filebot filebot.sh: bin/filebot
FileBot.jar: filebot/FileBot.jar FileBot.jar: filebot/FileBot.jar
lib7-Zip-JBinding.so: filebot/lib/amd64/lib7-Zip-JBinding.so lib7-Zip-JBinding.so: filebot/lib/amd64/lib7-Zip-JBinding.so
oracle-java: oracle-java:
plugin: copy plugin: copy
files: files:
oracle-java: oracle-java oracle-java: oracle-java
packages: packages:
plugin: nil plugin: nil
stage-packages: stage-packages:
@ -32,7 +34,6 @@ parts:
- light-themes - light-themes
- libcanberra-gtk-module - libcanberra-gtk-module
- jayatana - jayatana
- gvfs
- unity-gtk2-module - unity-gtk2-module
- overlay-scrollbar-gtk2 - overlay-scrollbar-gtk2
- libmediainfo0v5 - libmediainfo0v5