diff options
author | Dictator Mei | 2018-08-30 10:01:46 +0900 |
---|---|---|
committer | Dictator Mei | 2018-08-30 10:01:46 +0900 |
commit | 25542d102bfcce33b6a4be0143c78e0ce4f5cf65 (patch) | |
tree | 634f7f724f65da316dac076461cfb3ca743c6a65 | |
parent | 5ac2938406c7fd8c7a359bf8ca1492c22b3b1fc9 (diff) | |
download | aur-25542d102bfcce33b6a4be0143c78e0ce4f5cf65.tar.gz |
fix java
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | HMCL.run | 2 | ||||
-rw-r--r-- | PKGBUILD | 8 |
3 files changed, 8 insertions, 8 deletions
@@ -6,14 +6,14 @@ pkgbase = hmcl-git arch = any license = GPL3 makedepends = git - makedepends = jdk - depends = jre + makedepends = java-environment>=8 + depends = java-openjfx>=8 provides = hmcl conflicts = hmcl source = git://github.com/huanghongxun/HMCL.git source = HMCL.run sha512sums = SKIP - sha512sums = 72d3dc8366c09075ada4eafab977b7c175cf2da6b353e18421b89168044d4f32cd8cd5c5242ba67548b5d415ccc2ea4d81c4909e11407ed1411708e4550d9175 + sha512sums = a9277570636161664a4d4b5c7cef7ff029e9dcccd2c36372c1294fc41cfec3c63a4be3e0f6c0acff79020f6a087d40b41c2463bce0acb16c866dfa7f9c0d533a pkgname = hmcl-git @@ -5,5 +5,5 @@ if [[ "$1" != "-p" ]]; then 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) +_java=$(ls /usr/lib/jvm | grep java | grep 8 | grep jre | sort -t - -k 2 -n | tail -n 1) exec /usr/lib/jvm/$_java/jre/bin/java -jar /usr/share/hmcl/hmcl.jar @@ -7,21 +7,21 @@ pkgdesc="A powered Minecraft launcher that supports a lot of features." arch=('any') url="https://github.com/huanghongxun/HMCL" license=('GPL3') -depends=('jre') -makedepends=("git" "jdk") +depends=('java-openjfx>=8') +makedepends=("git" "java-environment>=8") provides=('hmcl') conflicts=('hmcl') source=("git://github.com/huanghongxun/$_pkgname.git" "$_pkgname.run") sha512sums=("SKIP" - "72d3dc8366c09075ada4eafab977b7c175cf2da6b353e18421b89168044d4f32cd8cd5c5242ba67548b5d415ccc2ea4d81c4909e11407ed1411708e4550d9175") + "a9277570636161664a4d4b5c7cef7ff029e9dcccd2c36372c1294fc41cfec3c63a4be3e0f6c0acff79020f6a087d40b41c2463bce0acb16c866dfa7f9c0d533a") pkgver() { git -C HMCL describe --tag | sed 's/^v//' } build() { - _java=$(ls /usr/lib/jvm | grep -v openjdk | grep java | grep jdk | sort -t - -k 2 -n | tail -n 1) + _java=$(ls /usr/lib/jvm | grep java | grep jdk | sort -t - -k 2 -n | tail -n 1) export JAVA_HOME=/usr/lib/jvm/$_java cd $srcdir/$_pkgname sh gradlew build |