From 4d5248b09b23a3d46d4a1ec389907d9462100f63 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Wed, 15 Jun 2016 01:18:00 +0800 Subject: [PATCH] + Experiment with snappy / snapcraft @see https://github.com/ubuntu/snappy-playpen/blob/master/galculator/galculator.wrapper --- installer/snappy/filebot.sh | 56 +++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/installer/snappy/filebot.sh b/installer/snappy/filebot.sh index 134dbd84..3b6529fd 100755 --- a/installer/snappy/filebot.sh +++ b/installer/snappy/filebot.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash export LANG=C.UTF-8 export ARCH=x86_64-linux-gnu @@ -25,9 +25,7 @@ export XKB_CONFIG_ROOT=$SNAP/usr/share/X11/xkb export XDG_CONFIG_DIRS=$SNAP/usr/xdg:$SNAP/etc/xdg:$XDG_CONFIG_DIRS export XDG_DATA_DIRS=$SNAP/usr/share:$SNAP_USER_DATA:$XDG_DATA_DIRS -export XDG_DATA_HOME=$SNAP/usr/share -export XDG_DATA_HOME=$SNAP/usr/share export FONTCONFIG_PATH=$SNAP/etc/fonts/config.d export FONTCONFIG_FILE=$SNAP/etc/fonts/fonts.conf @@ -43,4 +41,56 @@ 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 +export XDG_DATA_HOME=$SNAP_USER_DATA/XDG/data-$SNAP_VERSION +export XDG_DATA_DIRS=$XDG_DATA_HOME:$XDG_DATA_DIRS +mkdir -p $XDG_DATA_HOME + +# Set cache folder to local path, dependent on snap version +export XDG_CACHE_HOME=$SNAP_USER_DATA/XDG/cache-$SNAP_VERSION +mkdir -p $XDG_CACHE_HOME + +# Not good, needed for fontconfig and themes +ln -sf $SNAP/usr/share/{fonts,themes} $XDG_DATA_HOME + +# Build mime.cache +if [ ! -d $XDG_DATA_HOME/mime ]; then + cp -r $SNAP/usr/share/mime $XDG_DATA_HOME + $SNAP/usr/bin/update-mime-database $XDG_DATA_HOME/mime +fi + +# Setup GDK pixbuf loaders +export GDK_PIXBUF_MODULE_FILE=$XDG_CACHE_HOME/gdk-pixbuf-loaders.cache +export GDK_PIXBUF_MODULEDIR=$SNAP/usr/lib/$ARCH/gdk-pixbuf-2.0/2.10.0/loaders + +if [ ! -e $GDK_PIXBUF_MODULE_FILE ]; then + $SNAP/usr/lib/$ARCH/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders > $GDK_PIXBUF_MODULE_FILE +fi + +# Keep an array of data dirs, for looping through them +IFS=':' read -r -a data_dirs_array <<< "$XDG_DATA_DIRS" + +# Icon themes cache +if [ ! -d $XDG_DATA_HOME/icons ]; then + mkdir -p $XDG_DATA_HOME/icons + for d in "${data_dirs_array[@]}"; do + for i in $d/icons/*; do + if [ -d "$i" ]; then + theme_dir=$XDG_DATA_HOME/icons/$(basename "$i") + mkdir -p "$theme_dir" + ln -sf $i/* "$theme_dir" + $SNAP/usr/sbin/update-icon-caches "$theme_dir" + fi + done + done +fi + + + + + 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" "$@"