summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Vasilev2020-10-10 16:41:25 +0300
committerRoman Vasilev2020-10-10 16:41:25 +0300
commit81c3e00932bbd36d018369eaa2c077e427a8168b (patch)
tree135a1ee863d86e2a70d07918f38c58f9378bc2fc
parent967eec2a67e03fdf06b5e68ac4ea06d3d7ff40f9 (diff)
downloadaur-81c3e00932bbd36d018369eaa2c077e427a8168b.tar.gz
some text cleanup, no version bump
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--filebot.install12
-rwxr-xr-xfilebot.sh2
4 files changed, 3 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 23dee6378e7e..e77b52f88895 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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 = e63065c98d9e55ceaf233fc8bc8d48f7
+ md5sums = 9b7ba1e301b3f4c8b9a751d6a00414ea
pkgname = filebot
diff --git a/PKGBUILD b/PKGBUILD
index 7029ad492912..1a87d4cb901c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -35,7 +35,7 @@ source=("https://get.filebot.net/filebot/FileBot_${pkgver}/FileBot_${pkgver}-aur
#noextract=()
md5sums=('8417980b971ad2099066216b815f50af'
- 'e63065c98d9e55ceaf233fc8bc8d48f7')
+ '9b7ba1e301b3f4c8b9a751d6a00414ea')
#validpgpkeys=()
#prepare() {}
diff --git a/filebot.install b/filebot.install
index c63078777744..89f3f4d18547 100644
--- a/filebot.install
+++ b/filebot.install
@@ -3,18 +3,6 @@ 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)"
-echo -e "\e[1;33m==>\e[0m \e[0;37m liberica-jdk-full-bin \e[0m is absolutely required as Java runtime"
-echo ""
-
-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 ""
diff --git a/filebot.sh b/filebot.sh
index 013d9337fb1e..5cce0baf4a73 100755
--- a/filebot.sh
+++ b/filebot.sh
@@ -15,7 +15,7 @@ fi
# select application data folder
APP_DATA="$HOME/.config/filebot"
-LIBRARY_PATH="$FILEBOT_HOME/lib/$(uname -m)"
+LIBRARY_PATH="$FILEBOT_HOME/lib/$(uname -m):/lib64"
MODULE_PATH="$FILEBOT_HOME/openjfx"
/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" "$@"