From 97ac339eeeda08a2b3900d28ab47505e702f7edf Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Thu, 25 Jun 2015 20:10:40 +0000 Subject: [PATCH] * standardize filebot.sh for embedded linux --- installer/ipkg/filebot.sh | 11 ++++++++--- installer/portable/filebot.sh | 31 +++++++++++++++++++++++-------- installer/spk/package/filebot.sh | 18 +++++++++--------- 3 files changed, 40 insertions(+), 20 deletions(-) diff --git a/installer/ipkg/filebot.sh b/installer/ipkg/filebot.sh index 9473eb93..54e1e32b 100644 --- a/installer/ipkg/filebot.sh +++ b/installer/ipkg/filebot.sh @@ -6,13 +6,18 @@ APP_DATA="$APP_ROOT/data/$USER" # add APP_ROOT to LD_LIBRARY_PATH if [ ! -z "$LD_LIBRARY_PATH" ] then - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$APP_ROOT" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$APP_ROOT" else - export LD_LIBRARY_PATH="$APP_ROOT" + export LD_LIBRARY_PATH="$APP_ROOT" fi # force JVM language and encoding settings export LANG="en_US.UTF-8" export LC_ALL="en_US.UTF-8" -java -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding=UTF-8 -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=ipkg -Dnet.filebot.Archive.extractor=SevenZipExecutable "-Dnet.filebot.Archive.7z=7z" "-Dnet.filebot.AcoustID.fpcalc=fpcalc" "-Duser.home=$APP_DATA" "-Dapplication.dir=$APP_DATA" "-Djava.io.tmpdir=$APP_DATA/temp" -jar "$APP_ROOT/FileBot.jar" "$@" +# FileBot settings +# EXTRACTOR="SevenZipNativeBindings" # use the lib7-Zip-JBinding.so native library +# EXTRACTOR="SevenZipExecutable" # use the 7z executable +EXTRACTOR="ApacheVFS" # use Apache Commons VFS2 with junrar plugin + +java -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding="UTF-8" -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=ipkg -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir="$APP_DATA" -Djava.io.tmpdir="$APP_DATA/temp" -Duser.home="$APP_DATA" -jar "$APP_ROOT/FileBot.jar" "$@" diff --git a/installer/portable/filebot.sh b/installer/portable/filebot.sh index f8910202..b7c4419c 100644 --- a/installer/portable/filebot.sh +++ b/installer/portable/filebot.sh @@ -3,13 +3,13 @@ PRG="$0" # resolve relative symlinks while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi done # make it fully qualified @@ -20,9 +20,24 @@ APP_ROOT=`cd "$PRG_DIR" && pwd` # 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 APP_ROOT to LD_LIBRARY_PATH +if [ ! -z "$LD_LIBRARY_PATH" ] +then + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$APP_ROOT" +else + export LD_LIBRARY_PATH="$APP_ROOT" +fi # force JVM language and encoding settings export LANG="en_US.UTF-8" export LC_ALL="en_US.UTF-8" -java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding=UTF-8 -Djava.net.useSystemProxies=false -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=portable -Dnet.filebot.Archive.extractor=SevenZipExecutable "-Dnet.filebot.Archive.7z=7z" "-Dnet.filebot.AcoustID.fpcalc=fpcalc" "-Dapplication.dir=$APP_ROOT" "-Djava.io.tmpdir=$APP_ROOT/temp" "-Duser.home=$APP_ROOT" "-Djna.library.path=$APP_ROOT" "-Djava.library.path=$APP_ROOT" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory "-Dnet.filebot.util.prefs.file=$APP_ROOT/prefs.properties" -jar "$APP_ROOT/FileBot.jar" "$@" +# FileBot settings +# EXTRACTOR="SevenZipNativeBindings" # use the lib7-Zip-JBinding.so native library +# EXTRACTOR="SevenZipExecutable" # use the 7z executable +EXTRACTOR="ApacheVFS" # use Apache Commons VFS2 with junrar plugin + +java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding="UTF-8" -Djava.net.useSystemProxies=false -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=portable -Dnet.filebot.Archive.extractor="$EXTRACTOR" -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" "$@" diff --git a/installer/spk/package/filebot.sh b/installer/spk/package/filebot.sh index 1d9eb84e..2afa62e8 100644 --- a/installer/spk/package/filebot.sh +++ b/installer/spk/package/filebot.sh @@ -3,13 +3,13 @@ PRG="$0" # resolve relative symlinks while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi done # make it fully qualified @@ -36,9 +36,9 @@ SYNO_LIBRARY_PATH="/usr/local/mediainfo/lib:/usr/local/chromaprint/lib" # add APP_ROOT to LD_LIBRARY_PATH if [ ! -z "$LD_LIBRARY_PATH" ] then - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SYNO_LIBRARY_PATH:$APP_ROOT" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SYNO_LIBRARY_PATH:$APP_ROOT" else - export LD_LIBRARY_PATH="$SYNO_LIBRARY_PATH:$APP_ROOT" + export LD_LIBRARY_PATH="$SYNO_LIBRARY_PATH:$APP_ROOT" fi # force JVM language and encoding settings