Use liberica-jre-11-full>=11 as JRE fixes #12. Use of author provided launcher should close #14 and close #8

4 files changed, 45 insertions, 79 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 88caf3a5e0f9..58c43adeefd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = filebot
 	pkgdesc = The ultimate TV and Movie Renamer
 	pkgver = 4.9.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.filebot.net/
 	install = filebot.install
 	arch = i686
@@ -10,8 +10,7 @@ pkgbase = filebot
 	arch = armv7l
 	arch = armv7h
 	license = Commercial
-	depends = java-runtime-headless>=11
-	depends = java-openjfx>=11
+	depends = liberica-jre-11-full>=11
 	depends = fontconfig
 	depends = chromaprint
 	optdepends = libzen: Required by libmediainfo
@@ -21,9 +20,7 @@ pkgbase = filebot
 	conflicts = filebot47
 	conflicts = filebot-git
 	source = https://get.filebot.net/filebot/FileBot_4.9.2/FileBot_4.9.2-aur.tar.xz
-	source = filebot-arch.sh
 	md5sums = 8417980b971ad2099066216b815f50af
-	md5sums = ceb8aa1774827e96deeac528b3a53c0a
 
 pkgname = filebot
 
diff --git a/PKGBUILD b/PKGBUILD
index 34633f87e2f1..f95d9855c0bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,66 +8,50 @@
 
 pkgname=filebot
 pkgver=4.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The ultimate TV and Movie Renamer"
 arch=('i686' 'x86_64' 'aarch64' 'armv7l' 'armv7h')
 url="https://www.filebot.net/"
 license=('Commercial')
-install=$pkgname.install
-# install=()
-depends=('java-runtime-headless>=11' 'java-openjfx>=11' 'fontconfig' 'chromaprint')
+#groups=()
+depends=('liberica-jre-11-full>=11' 'fontconfig' 'chromaprint')
 makedepends=()
-provides=('filebot')
-conflicts=('filebot47' 'filebot-git')
-
-[[ $CARCH == "i686" ]]   && _intarch=i686
-[[ $CARCH == "x86_64" ]] && _intarch=amd64
-[[ $CARCH == "armv7l" ]] && _intarch=armv7l
-[[ $CARCH == "armv7h" ]] && _intarch=armv7l
-[[ $CARCH == "aarch64" ]] && _intarch=armv8
-
-source=(#"https://get.filebot.net/filebot/FileBot_${pkgver}/FileBot_${pkgver}-portable.tar.xz"
-        "https://get.filebot.net/filebot/FileBot_${pkgver}/FileBot_${pkgver}-aur.tar.xz"
-        $pkgname-arch.sh
-        #$pkgname.svg
-        #$pkgname.desktop
-        )
-
-md5sums=('8417980b971ad2099066216b815f50af'
-         'ceb8aa1774827e96deeac528b3a53c0a')
+checkdepends=()
 
 optdepends=('libzen: Required by libmediainfo'
-	    'libmediainfo: Read media info such as video codec, resolution or duration'
-	    'gvfs: Drag-n-Drop from GVFS remote filesystems')
+            'libmediainfo: Read media info such as video codec, resolution or duration'
+            'gvfs: Drag-n-Drop from GVFS remote filesystems')
 
-prepare() {
-  cd "$srcdir"
-}
+provides=('filebot')
 
-build() {
-  cd $srcdir
-}
+conflicts=('filebot47' 'filebot-git')
+#replaces=()
+#backup=()
+#options=()
+install=$pkgname.install
+#changelog=
+source=("https://get.filebot.net/filebot/FileBot_${pkgver}/FileBot_${pkgver}-aur.tar.xz")
 
-package() {
-  mkdir -p $pkgdir/usr/share/{java/$pkgname,applications,mime/packages,icons/hicolor}
+#noextract=()
+md5sums=('8417980b971ad2099066216b815f50af')
+#validpgpkeys=()
 
-  install -Dm755 $pkgname-arch.sh "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 $srcdir/usr/share/$pkgname/lib/$CARCH/libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so"
+#prepare() {}
 
-  cd "$srcdir/usr/share"
+#build() {}
 
-  cp -dpr --no-preserve=ownership $pkgname/jar/* "$pkgdir/usr/share/java/$pkgname/"
+#check() {}
 
-  cp -dpr --no-preserve=ownership icons/hicolor/* "$pkgdir/usr/share/icons/hicolor/"
+package() {
+  cd $srcdir
 
-  #install -Dm644 $pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg"
-  #install -Dm644 icons/hicolor/scalable/apps/$pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg"
+  install -Dm755 usr/share/filebot/bin/$pkgname.sh "$pkgdir/usr/bin/$pkgname"
+  # chmod +x usr/share/filebot/bin/$pkgname.sh
+  # cp -dp -s /usr/share/filebot/bin/$pkgname.sh $pkgdir/usr/bin/$pkgname
+  
+  cp -dpr --no-preserve=ownership * "$pkgdir"
 
-  #install -Dm644 applications/*.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
-  #mkdir -p $pkgdir/usr/share/applications/
-  cp -dpr --no-preserve=ownership applications/* "$pkgdir/usr/share/applications/"
+  # chmod +x usr/share/filebot/bin/$pkgname.sh
+  # cp -dp -s /usr/share/filebot/bin/$pkgname.sh $pkgdir/usr/bin/$pkgname
 
-  #mkdir -p $pkgdir/usr/share/mime/packages/
-  cp -dpr --no-preserve=ownership mime/* "$pkgdir/usr/share/mime/"
-  
 }
diff --git a/filebot-arch.sh b/filebot-arch.sh
deleted file mode 100644
index 6a10b25a1029..000000000000
--- a/filebot-arch.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# force JVM language and encoding settings
-export LANG="en_US.UTF-8"
-export LC_ALL="en_US.UTF-8"
-
-APP_ROOT=/usr/share/java/filebot
-
-# 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
-
-# start filebot
-/usr/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 "$@"
-
diff --git a/filebot.install b/filebot.install
index f92b003e6668..d8a7f208cfdf 100644
--- a/filebot.install
+++ b/filebot.install
@@ -1,15 +1,23 @@
 post_install() {
-echo -e "\e[1;33m==>\e[0m if you use OpenJDK as Java VM you \e[1;31mmust\e[0m also install OpenJFX"
-echo -e "\e[1;33m==>\e[0m \e[1;36mhttps://wiki.archlinux.org/index.php/Java#OpenJFX\e[0m"
+echo "\e[1;33m==>\e[0m This version of Filebot is using Java 11+"
+echo "\e[1;33m==>\e[0m Java 8 dependency could be removed"
 echo ""
-echo -e "\e[1;33m==>\e[0m \e[1;31mfilebot --license license.file\e[0m will activate your license.file"
+
+echo -e "\e[1;33m==>\e[0m As of Filebot 4.9.2 and this comment (\e[1;36m https://github.com/arch-noob/filebot/issues/12#issuecomment-704131387 \e[0m)"
+echo -e "\e[1;33m==>\e[0m \e[0;37m liberica-jdk-full-bin \e[0m is absolutely required as Java runtime"
 echo ""
-echo "This version of Filebot is using Java 11 or 14  with OpenJFX"
-echo "so java-8 dependency could be removed."
 
+echo -e "\e[1;33m==>\e[0m if you use another JDK or runtime (experimental and not recommended) you \e[1;31m must \e[0m also install OpenJFX"
+echo -e "\e[1;33m==>\e[0m \e[1;36m https://wiki.archlinux.org/index.php/Java#OpenJFX \e[0m"
+echo ""
 
+echo -e "\e[1;33m==>\e[0m \e[1;31m filebot --license license.file \e[0m will activate your license.file"
+echo ""
 
-filebot -script fn:properties --def net.filebot.archive.extractor=ShellExecutables
+echo -e "\e[1;33m==>\e[0m To enable system extractor for archives please run"
+echo -e ""
+echo -e "\e[1;33m==>\e[0m \e[1;31m filebot -script fn:properties --def net.filebot.archive.extractor=ShellExecutables \e[0m"
+echo ""
 }
 
 post_upgrade() {