New version 3.2.140

2 files changed, 41 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d90e394f7f6b..4b4c33ab33fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = hmcl
-	pkgdesc = Hello Minecraft! Launcher, a powerful Minecraft launcher.
-	pkgver = 3.2.134
+	pkgdesc = A Minecraft Launcher which is multi-functional, cross-platform and popular
+	pkgver = 3.2.140
 	pkgrel = 1
 	url = https://github.com/huanghongxun/HMCL
-	arch = x86_64
+	arch = any
 	license = GPL3
-	makedepends = java-environment=8
+	makedepends = jdk8-openjdk
 	depends = java8-openjfx
+	provides = hmcl
+	conflicts = hmcl
 	source = hmcl-launch-script
 	source = hmcl.desktop
-	source = hmcl-3.2.134.tgz::https://github.com/huanghongxun/HMCL/archive/v3.2.134.tar.gz
+	source = hmcl-3.2.140.tgz::https://github.com/huanghongxun/HMCL/archive/v3.2.140.tar.gz
 	sha256sums = c6310315a7bc5f0512d1d307bdf1c4fffa3c55707f019274b32f9b2d132688d1
 	sha256sums = 5780cf70f1afec0eb3cd8fc43297d361903c7204e274a28c5edf9b8ac3eea83e
-	sha256sums = 2c80b3ff5348d54b51594b6e80f37acfcdd3e7eb4b3e95b60af37c16f999f375
+	sha256sums = 2a2a03bdd99257a61ce778dd97a9db367816ecc91917160ed2b82f9ea86d087f
 
 pkgname = hmcl
 
diff --git a/PKGBUILD b/PKGBUILD
index c07d8a32a23c..8475013c57dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,50 @@
-# Maintainer: Lin Ruoshui <LinRs at users.noreply.github dot com>
+# Maintainer: Hao Long <aur@esd.cc>
+# Contributor: Lin Ruoshui <LinRs at users.noreply.github dot com>
 # Contributor: hexchain <i at hexchain.org>
 
 pkgname=hmcl
 _pkgname=HMCL
-pkgver=3.2.134
-_pkgver=3.2
+pkgver=3.2.140
 pkgrel=1
-pkgdesc="Hello Minecraft! Launcher, a powerful Minecraft launcher."
-arch=('x86_64')
-license=('GPL3')
+pkgdesc="A Minecraft Launcher which is multi-functional, cross-platform and popular"
+arch=('any')
 url="https://github.com/huanghongxun/HMCL"
-depends=('java8-openjfx') #'java-openjfx>=8'
-makedepends=('java-environment=8')
-source=(
-    "hmcl-launch-script"
-    "${pkgname}.desktop"
-    "${pkgname}-${pkgver}.tgz::${url}/archive/v${pkgver}.tar.gz"
-)
+license=('GPL3')
+provides=('hmcl')
+conflicts=('hmcl')
+depends=('java8-openjfx')
+makedepends=('jdk8-openjdk')
+source=("hmcl-launch-script"
+        "${pkgname}.desktop"
+        "${pkgname}-${pkgver}.tgz::${url}/archive/v${pkgver}.tar.gz")
 sha256sums=('c6310315a7bc5f0512d1d307bdf1c4fffa3c55707f019274b32f9b2d132688d1'
             '5780cf70f1afec0eb3cd8fc43297d361903c7204e274a28c5edf9b8ac3eea83e'
-            '2c80b3ff5348d54b51594b6e80f37acfcdd3e7eb4b3e95b60af37c16f999f375')
+            '2a2a03bdd99257a61ce778dd97a9db367816ecc91917160ed2b82f9ea86d087f')
+
+prepare() {
+    cd "${_pkgname}-${pkgver}"
+    # Fix license check
+    sed "s/\${year}/2019/" license-header.txt -i
+}
+
 build() {
     cd "${_pkgname}-${pkgver}"
-    export JAVA_HOME="/usr/lib/jvm/default/"
+    _java=$(ls /usr/lib/jvm | grep 8-openjdk)
+    export JAVA_HOME=/usr/lib/jvm/$_java
     sh gradlew build
 }
-package() {
-    #custom launch script
-    install -D -m755 "hmcl-launch-script" \
-	    "${pkgdir}/usr/bin/$pkgname"
-    #desktop file
-    install -D -m644 "hmcl.desktop" \
-	    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
+package() {
+    # custom launch script
+    install -Dm755 "hmcl-launch-script" "${pkgdir}/usr/bin/$pkgname"
+    # desktop file
+    install -Dm644 "hmcl.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
     cd "${_pkgname}-${pkgver}/${_pkgname}/build"
-    #install license
-    install -Dm644 "../../license-header.txt" \
-	    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    #install jar
-    install -Dm644 "libs/${_pkgname}-${_pkgver}.SNAPSHOT.jar" \
-	    "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar"
+
+    # install jar
+    _path=$(echo libs/HMCL*.jar)
+    install -Dm644 $_path "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar"
     # install icon
-    install -Dm644 "resources/main/assets/img/craft_table.png" \
-	    "${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png"
+    install -Dm644 "resources/main/assets/img/craft_table.png" "${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png"
 }