diff --git a/installer/spk/package/filebot.sh b/installer/spk/package/filebot.sh index a4890543..ae83df91 100644 --- a/installer/spk/package/filebot.sh +++ b/installer/spk/package/filebot.sh @@ -16,11 +16,13 @@ done WORKING_DIR=`pwd` PRG_DIR=`dirname "$PRG"` APP_ROOT=`cd "$PRG_DIR" && pwd` -APP_DATA="$APP_ROOT/data" # restore original working dir cd "$WORKING_DIR" +# user per user app data location to avoid permission conflicts between root and admin users +APP_DATA="$APP_ROOT/data/$USER" + # add 3rd party packages to the library path by default SYNO_LIBRARY_PATH="/var/packages/mediainfo/target/lib" @@ -36,4 +38,4 @@ fi export LANG="en_US.UTF-8" export LC_ALL="en_US.UTF-8" -java -Djava.awt.headless=true -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding=UTF-8 -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=spk "-Dnet.filebot.AcoustID.fpcalc=fpcalc" -Dnet.filebot.Archive.extractor=SevenZipExecutable "-Dnet.filebot.Archive.7z=/usr/syno/bin/7z" "-Dapplication.dir=$APP_DATA" "-Djava.io.tmpdir=$APP_DATA/temp" "-Duser.home=$APP_DATA" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory "-Dnet.filebot.util.prefs.file=$APP_DATA/prefs.properties" -jar "$APP_ROOT/FileBot.jar" "$@" +java -Djava.awt.headless=true -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding=UTF-8 -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=spk -Dnet.filebot.Archive.extractor=SevenZipExecutable "-Dnet.filebot.Archive.7z=/usr/syno/bin/7z" "-Dnet.filebot.AcoustID.fpcalc=fpcalc" "-Dapplication.dir=$APP_DATA" "-Djava.io.tmpdir=$APP_DATA/temp" "-Duser.home=$APP_DATA" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory "-Dnet.filebot.util.prefs.file=$APP_DATA/prefs.properties" -jar "$APP_ROOT/FileBot.jar" "$@"