making jre11-openjdk + java11-openjfx to work without throwing errors

4 files changed, 17 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index afbc3398e238..23dee6378e7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = filebot
 	pkgdesc = The ultimate TV and Movie Renamer
 	pkgver = 4.9.2
-	pkgrel = 4
+	pkgrel = 5
 	url = https://www.filebot.net/
 	install = filebot.install
 	arch = i686
@@ -23,7 +23,7 @@ pkgbase = filebot
 	source = https://get.filebot.net/filebot/FileBot_4.9.2/FileBot_4.9.2-aur.tar.xz
 	source = filebot.sh
 	md5sums = 8417980b971ad2099066216b815f50af
-	md5sums = a49421b6cfd7b17834fc01990b93fbb7
+	md5sums = e63065c98d9e55ceaf233fc8bc8d48f7
 
 pkgname = filebot
 
diff --git a/PKGBUILD b/PKGBUILD
index 3c69cb678022..7029ad492912 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=filebot
 pkgver=4.9.2
-pkgrel=4
+pkgrel=5
 pkgdesc="The ultimate TV and Movie Renamer"
 arch=('i686' 'x86_64' 'aarch64' 'armv7l' 'armv7h')
 url="https://www.filebot.net/"
@@ -35,7 +35,7 @@ source=("https://get.filebot.net/filebot/FileBot_${pkgver}/FileBot_${pkgver}-aur
 
 #noextract=()
 md5sums=('8417980b971ad2099066216b815f50af'
-         'a49421b6cfd7b17834fc01990b93fbb7')
+         'e63065c98d9e55ceaf233fc8bc8d48f7')
 #validpgpkeys=()
 
 #prepare() {}
@@ -46,6 +46,7 @@ md5sums=('8417980b971ad2099066216b815f50af'
 
 package() {
   mkdir -p $pkgdir/usr/bin
+  mkdir -p $pkgdir/usr/share/$pkgname/openjfx
  
   install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"
 
diff --git a/filebot.install b/filebot.install
index d8a7f208cfdf..c63078777744 100644
--- a/filebot.install
+++ b/filebot.install
@@ -1,6 +1,10 @@
 post_install() {
-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 -e "\e[1;33m==>\e[0m Symlinking OpenJFX"
+ln -sf /usr/lib/jvm/java-11-openjdk/lib/javafx.* /usr/share/filebot/openjfx/
+echo ""
+
+echo -e "\e[1;33m==>\e[0m This version of Filebot is using Java 11+"
+echo -e "\e[1;33m==>\e[0m Java 8 dependency could be removed"
 echo ""
 
 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)"
@@ -24,3 +28,7 @@ post_upgrade() {
   post_install $1
 }
 
+pre_remove() {
+echo -e "\e[1;33m==>\e[0m Removing OpenJFX symlinks leftover"
+rm -r /usr/share/filebot/openjfx/*
+}
diff --git a/filebot.sh b/filebot.sh
index 872ae72a047e..013d9337fb1e 100755
--- a/filebot.sh
+++ b/filebot.sh
@@ -16,6 +16,6 @@ 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"
+MODULE_PATH="$FILEBOT_HOME/openjfx"
 
-/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" "$@"
+/usr/lib/jvm/java-11-openjdk/bin/java -Dapplication.deployment=aur --module-path "$MODULE_PATH" --add-modules ALL-MODULE-PATH -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" "$@"