diff --git a/build.xml b/build.xml index 10660d74..ec527d46 100644 --- a/build.xml +++ b/build.xml @@ -548,47 +548,38 @@ - - - - - - - + - - - - + + - + - - + - + - + - - - - + + + + @@ -780,7 +771,7 @@ - + @@ -792,7 +783,6 @@ - diff --git a/installer/deb/deb/FileBot.desktop b/installer/deb/FileBot.desktop similarity index 100% rename from installer/deb/deb/FileBot.desktop rename to installer/deb/FileBot.desktop diff --git a/installer/deb/deb/filebot.sh b/installer/deb/filebot.sh similarity index 94% rename from installer/deb/deb/filebot.sh rename to installer/deb/filebot.sh index 50a01b0e..13503475 100644 --- a/installer/deb/deb/filebot.sh +++ b/installer/deb/filebot.sh @@ -1,5 +1,5 @@ #!/bin/sh -APP_ROOT=@{deb.prefix}/share/filebot +APP_ROOT=/usr/share/filebot if [ -z "$HOME" ]; then echo '$HOME must be set' diff --git a/installer/deb/ipk/filebot.sh b/installer/deb/ipk/filebot.sh deleted file mode 100644 index 55ad6112..00000000 --- a/installer/deb/ipk/filebot.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -APP_ROOT=@{deb.prefix}/share/filebot - -# make sure required environment variables are set -if [ -z "$USER" ]; then - export USER=`whoami` -fi - -# force JVM language and encoding settings -export LANG="C.UTF-8" -export LC_ALL="C.UTF-8" - -# 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 - -# choose extractor -EXTRACTOR="ApacheVFS" # use Apache Commons VFS2 with junrar plugin -# EXTRACTOR="SevenZipExecutable" # use the 7z executable -# EXTRACTOR="SevenZipNativeBindings" # use the lib7-Zip-JBinding.so native library - -# select application data folder -APP_DATA="$APP_ROOT/data/$USER" - -# start filebot -java -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dfile.encoding="UTF-8" -Djna.nosys=false -Djna.nounpack=true -Dsun.jnu.encoding="UTF-8" -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" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@" diff --git a/website/download.php b/website/download.php index affbfeed..25c872e5 100644 --- a/website/download.php +++ b/website/download.php @@ -22,8 +22,6 @@ if ($type == 'nsis') { $file = 'filebot_'.$version.'_'.$arch.'.deb'; } else if ($type == 'portable') { $file = 'FileBot_'.$version.'-portable.tar.xz'; -} else if ($type == 'ipkg') { - $file = 'filebot_'.$version.'_noarch.ipk'; } else { $folder = 'https://sourceforge.net/projects/filebot/files/filebot/FileBot_'.$version; // redirect to latest release folder by default } diff --git a/website/index.html b/website/index.html index 9a612025..aa844ac1 100644 --- a/website/index.html +++ b/website/index.html @@ -296,7 +296,7 @@
  • Debian packages: filebot_@{version}_i386.deb or filebot_@{version}_amd64.deb
  • -
  • Embedded Linux package: filebot_@{version}_noarch.ipk
  • +
  • Embedded Linux package: filebot_@{version}_armhf.deb
  • Portable package: FileBot-@{version}-portable.tar.xz