update to javafx

4 files changed, 30 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7f8d5e63465..ef19abaf5e7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,19 @@
 pkgbase = hmcl-git
 	pkgdesc = A powered Minecraft launcher that supports a lot of features.
-	pkgver = 2.0
-	pkgrel = 2
-	url = https://github.com/huanghongxun/HMCL/tree/master
-	install = HMCL.install
+	pkgver = 3.0
+	pkgrel = 1
+	url = https://github.com/huanghongxun/HMCL
 	arch = x86_64
 	license = GPL3
 	makedepends = git
+	makedepends = jdk
+	depends = jre
 	provides = hmcl
 	conflicts = hmcl
-	source = git://github.com/huanghongxun/HMCL.git#branch=master
-	source = https://soft.dct.party/aur/hmcl-git/jdk-8-linux-x64.tar.xz
-	source = https://soft.dct.party/aur/hmcl-git/jdk-8-linux-x64.tar.xz.sha512sum
+	source = git://github.com/huanghongxun/HMCL.git
 	source = HMCL.run
 	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
-	sha512sums = 4f83cd5629ef331f5d172fef3591964ac55da86c529cc7d87be8df63e25a29107773f7a389f83218bd9bd400963d01f9e1495898d9391c7a77042b475ee627cf
+	sha512sums = 1edd383debfde87cede19546391fc6d981e708c8bbe11a46e379e97e6e180235d5087cda8a66973403cc139bec4d75949729f05462d0c5003ae9379b816dcb82
 
 pkgname = hmcl-git
 
diff --git a/HMCL.install b/HMCL.install
deleted file mode 100644
index 08afac107884..000000000000
--- a/HMCL.install
+++ /dev/null
@@ -1,5 +0,0 @@
-HOME=$(grep 1000 /etc/passwd | head -1 | awk -F ':' '{print $6}')
-GRADLE=$HOME/.gradle
-post_remove() {
-    rm -r $GRADLE
-}
diff --git a/HMCL.run b/HMCL.run
index fa688d2cbb8c..695faed099a0 100644
--- a/HMCL.run
+++ b/HMCL.run
@@ -1,10 +1,9 @@
 #!/bin/bash
 
-export JAVA_HOME=/usr/share/hmcl/jre
-export PATH=$JAVA_HOME/bin:$PATH
-
-mpath=$HOME/.config/hmcl
-mkdir -p $mpath
-cd $mpath
-
-java -jar /usr/share/hmcl/hmcl.jar
+if [[ "$1" != "-p" ]]; then
+    WORKDIR=${XDG_CONFIG_HOME:-$HOME/.config}/hmcl
+    mkdir -p $WORKDIR
+    cd $WORKDIR
+fi
+_java=$(ls /usr/lib/jvm | grep -v openjdk | grep java | grep jre | sort -t - -k 2 -n | tail -n 1)
+exec /usr/lib/jvm/$_java -jar /usr/share/hmcl/hmcl.jar
diff --git a/PKGBUILD b/PKGBUILD
index 18c3099fcab1..55512a7ef5b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,34 @@
 # Maintainer: dctxmei <dctxmei@gmail.com>
 pkgname=hmcl-git
 _pkgname=HMCL
-pkgver=2.0
-pkgrel=2
+pkgver=3.0
+pkgrel=1
 pkgdesc="A powered Minecraft launcher that supports a lot of features."
-arch=("x86_64")
-url="https://github.com/huanghongxun/HMCL/tree/master"
-license=("GPL3")
-makedepends=("git")
-provides=("hmcl")
-conflicts=("hmcl")
-install="$_pkgname.install"
-source=("git://github.com/huanghongxun/$_pkgname.git#branch=master"
-        "https://soft.dct.party/aur/hmcl-git/jdk-8-linux-x64.tar.xz"
-        "https://soft.dct.party/aur/hmcl-git/jdk-8-linux-x64.tar.xz.sha512sum"
+arch=('x86_64')
+url="https://github.com/huanghongxun/HMCL"
+license=('GPL3')
+depends=('jre')
+makedepends=("git" "jdk")
+provides=('hmcl')
+conflicts=('hmcl')
+source=("git://github.com/huanghongxun/$_pkgname.git"
         "$_pkgname.run")
 sha512sums=("SKIP"
-        "SKIP"
-        "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e"
-        "4f83cd5629ef331f5d172fef3591964ac55da86c529cc7d87be8df63e25a29107773f7a389f83218bd9bd400963d01f9e1495898d9391c7a77042b475ee627cf")
+            "1edd383debfde87cede19546391fc6d981e708c8bbe11a46e379e97e6e180235d5087cda8a66973403cc139bec4d75949729f05462d0c5003ae9379b816dcb82")
 
 pkgver() {
-    git -C $_pkgname describe | sed -e 's/^v//' -e 's/-/./g'
+    git -C HMCL describe --tag | sed 's/^v//'
 }
 
 build() {
-    export JAVA_HOME=$srcdir/jdk1.8.0
+    _java=$(ls /usr/lib/jvm | grep -v openjdk | grep java | grep jdk | sort -t - -k 2 -n | tail -n 1)
+    export JAVA_HOME=/usr/lib/jvm/$_java
     cd $srcdir/$_pkgname
-    HOME=/root
-    bash gradlew build
+    sh gradlew build
 }
 
 package() {
-    _path=$(echo $srcdir/$_pkgname/$_pkgname/build/libs/HMCL-*sources.jar | sed 's/-sources//')
+    _path=$(echo $srcdir/$_pkgname/$_pkgname/build/libs/HMCL*.jar)
     install -Dm644 $_path $pkgdir/usr/share/hmcl/hmcl.jar
-    mv $JAVA_HOME/jre $pkgdir/usr/share/hmcl/jre
     install -Dm755 $srcdir/$_pkgname.run $pkgdir/usr/bin/hmcl
 }