Beta 4.8.5

2 files changed, 27 insertions, 11 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1267791d3fae..2b2fddc3ec23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,12 +8,12 @@
 
 pkgname=filebot-git
 _pkgname=filebot
-pkgver=4.8.5.20181128
+pkgver=4.8.5.20181202
 _pkgver=4.8.5
 pkgrel=1
 pkgdesc="The ultimate TV and Movie Renamer"
 _jnaver=4.5.2
-_fixedcommit=ca1b8c04400fc0e83cd04ad4c5d13361dbd855ea
+_fixedcommit=f6efdbced839f96f9685640345b2e4eee30f61b6
 arch=('i686' 'x86_64' 'aarch64' 'armv7l' 'armv7h')
 license=('Commercial')
 url="https://github.com/filebot/filebot"
@@ -33,12 +33,13 @@ _jre=$(archlinux-java get)
 
 source=("${_pkgname}::git+https://github.com/filebot/filebot.git"
         #https://github.com/java-native-access/jna/archive/$_jnaver.tar.gz
-        $_pkgname-arch.sh $_pkgname.svg $_pkgname.desktop)
+        $_pkgname-arch.sh
+        #$_pkgname.svg
+        #$_pkgname.desktop
+        )
 
 md5sums=('SKIP'
-         'a4cc7024a9c593abeb22a2511c96aef1'
-         '04f46be047049448dba3f0de29fe192d'
-         'f37edd0bba7570904d28ab1681c7a7f3')
+         'a1f708b2a17a1a548f910ea0c53a9f54')
 
 optdepends=('libzen: Required by libmediainfo'
 	    'libmediainfo: Read media info such as video codec, resolution or duration'
@@ -91,12 +92,27 @@ build() {
 }
 
 package() {
+  mkdir -p $pkgdir/usr/share/{java/$_pkgname,applications,icons}
+
   install -Dm644 $_pkgname/lib/native/linux-$_intarch/libjnidispatch.so "$pkgdir/usr/share/java/$_pkgname/libjnidispatch.so"
   cp -dpr --no-preserve=ownership $_pkgname/dist/lib/* "$pkgdir/usr/share/java/$_pkgname/"
 
   install -Dm755 $_pkgname-arch.sh "$pkgdir/usr/bin/$_pkgname"
-  install -Dm644 $_pkgname.svg "$pkgdir/usr/share/pixmaps/$_pkgname.svg"
-  install -Dm644 $_pkgname.desktop "$pkgdir/usr/share/applications/$_pkgname.desktop"
+
+  # install -Dm644 $_pkgname.desktop "$pkgdir/usr/share/applications/$_pkgname.desktop"
   
+  cd "$srcdir/$_pkgname/"
+
+  # copy .desktop files
+  cp -dpr --no-preserve=ownership installer/deb/share/applications/* "$pkgdir/usr/share/applications/"
+  
+  # copy MIME types
+  cp -dpr --no-preserve=ownership installer/deb/share/mime "$pkgdir/usr/share/mime"
+  sed -i "s/@{license.mimetype}/application\/x-filebot-license/g; s/@{license.description}/FileBot License File/g; s/@{package.name}/$_pkgname/g; s/@{license.extension}/psm/g" $pkgdir/usr/share/mime/packages/$_pkgname.xml
+
+  # copy Icons
+  # install -Dm644 $_pkgname.svg "$pkgdir/usr/share/pixmaps/$_pkgname.svg"
+  install -Dm644 installer/icons/$_pkgname.svg "$pkgdir/usr/share/icons/$_pkgname.svg"
+
   sudo archlinux-java set $_jre
 }
diff --git a/filebot-arch.sh b/filebot-arch.sh
index bc0ccdaf90ca..d84e4429de2b 100644
--- a/filebot-arch.sh
+++ b/filebot-arch.sh
@@ -14,10 +14,10 @@ else
 fi
 
 # choose extractor
-EXTRACTOR="ApacheVFS"			# use Apache Commons VFS2 with junrar plugin
-# EXTRACTOR="SevenZipExecutable"	# use the 7z executable
+# 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
 
 # start filebot
-/usr/lib/jvm/java-8-openjdk/jre/bin/java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dapplication.deployment=AUR -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djna.nosys=false -Djna.nounpack=true -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir=$HOME/.config/filebot -Djava.io.tmpdir=/tmp/filebot -Dapplication.update=skip -Djna.library.path=/usr/share/java/filebot $JAVA_OPTS -cp /usr/share/java/filebot/filebot.jar net.filebot.Main "$@"
+/usr/lib/jvm/java-8-openjdk/jre/bin/java -Dunixfs=false -DuseGVFS=true -Dnet.filebot.gio.GVFS="$XDG_RUNTIME_DIR/gvfs" -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=true -Dapplication.deployment=AUR -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djna.nosys=true -Djna.nounpack=true -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir=$HOME/.config/filebot -Djava.io.tmpdir=/tmp/filebot -Dapplication.update=skip -Djna.library.path="$APP_ROOT" $JAVA_OPTS $FILEBOT_OPTS -jar $APP_ROOT/filebot.jar "$@"