Revert JRE to jre11-openjdk + java11-openjfx

3 files changed, 35 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5e2bec91ae7..afbc3398e238 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = filebot
 	pkgdesc = The ultimate TV and Movie Renamer
 	pkgver = 4.9.2
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.filebot.net/
 	install = filebot.install
 	arch = i686
@@ -10,7 +10,8 @@ pkgbase = filebot
 	arch = armv7l
 	arch = armv7h
 	license = Commercial
-	depends = liberica-jre-11-full-bin
+	depends = jre11-openjdk
+	depends = java11-openjfx
 	depends = fontconfig
 	depends = chromaprint
 	optdepends = libzen: Required by libmediainfo
@@ -20,7 +21,9 @@ 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.sh
 	md5sums = 8417980b971ad2099066216b815f50af
+	md5sums = a49421b6cfd7b17834fc01990b93fbb7
 
 pkgname = filebot
 
diff --git a/PKGBUILD b/PKGBUILD
index 3584c1d2ca2d..3c69cb678022 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,13 +8,13 @@
 
 pkgname=filebot
 pkgver=4.9.2
-pkgrel=3
+pkgrel=4
 pkgdesc="The ultimate TV and Movie Renamer"
 arch=('i686' 'x86_64' 'aarch64' 'armv7l' 'armv7h')
 url="https://www.filebot.net/"
 license=('Commercial')
 #groups=()
-depends=('liberica-jre-11-full-bin' 'fontconfig' 'chromaprint')
+depends=('jre11-openjdk' 'java11-openjfx' 'fontconfig' 'chromaprint')
 makedepends=()
 checkdepends=()
 
@@ -30,10 +30,12 @@ conflicts=('filebot47' 'filebot-git')
 #options=()
 install=$pkgname.install
 #changelog=
-source=("https://get.filebot.net/filebot/FileBot_${pkgver}/FileBot_${pkgver}-aur.tar.xz")
+source=("https://get.filebot.net/filebot/FileBot_${pkgver}/FileBot_${pkgver}-aur.tar.xz"
+         "filebot.sh")
 
 #noextract=()
-md5sums=('8417980b971ad2099066216b815f50af')
+md5sums=('8417980b971ad2099066216b815f50af'
+         'a49421b6cfd7b17834fc01990b93fbb7')
 #validpgpkeys=()
 
 #prepare() {}
@@ -44,18 +46,13 @@ md5sums=('8417980b971ad2099066216b815f50af')
 
 package() {
   mkdir -p $pkgdir/usr/bin
+ 
+  install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"
 
   cd $srcdir
-
-  # 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"
   
-  ln -sf $srcdir/usr/share/$pkgname/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
+  # ln -sf $srcdir/usr/share/$pkgname/bin/$pkgname.sh $pkgdir/usr/bin/$pkgname
 
 }
diff --git a/filebot.sh b/filebot.sh
new file mode 100755
index 000000000000..872ae72a047e
--- /dev/null
+++ b/filebot.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+FILEBOT_HOME="/usr/share/filebot"
+
+
+# sanity check
+if [ -z "$HOME" ]; then
+	echo '$HOME must be set'
+	exit 1
+fi
+
+if [ "$EUID" = "0" ]; then
+	echo "$0 must NOT run as root"
+fi
+
+
+# select application data folder
+APP_DATA="$HOME/.config/filebot"
+LIBRARY_PATH="$FILEBOT_HOME/lib/$(uname -m)"
+# MODULE_PATH="/usr/lib/jvm/java-14-openjdk/lib"
+
+/usr/lib/jvm/java-11-openjdk/bin/java -Dapplication.deployment=aur -Dapplication.update=skip -Dnet.filebot.archive.extractor=ShellExecutables --illegal-access=permit --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.function=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.nio.file=ALL-UNNAMED --add-opens=java.base/java.nio.file.attribute=ALL-UNNAMED --add-opens=java.base/java.nio.channels=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.time.chrono=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/sun.nio.fs=ALL-UNNAMED --add-opens=java.logging/java.util.logging=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED --add-opens=java.desktop/sun.awt=ALL-UNNAMED --add-opens=java.desktop/sun.swing=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED -Djna.boot.library.path="$LIBRARY_PATH" -Djna.library.path="$LIBRARY_PATH" -Djava.library.path="$LIBRARY_PATH" -Dapplication.dir="$APP_DATA" -Dapplication.cache="$APP_DATA/cache" -Djava.io.tmpdir="$APP_DATA/tmp" -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Dprism.order=sw -Dnet.filebot.theme=Darcula -DuseGVFS=true -Dnet.filebot.gio.GVFS="$XDG_RUNTIME_DIR/gvfs" $JAVA_OPTS $FILEBOT_OPTS -jar "$FILEBOT_HOME/jar/filebot.jar" "$@"