Simplify and set JAVA_HOME to OpenJDK 8

1 files changed, 18 insertions, 48 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 999a1c4eae93..434a0e83fc07 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,60 +1,30 @@
-# Maintainer: Cranky Supertoon <crankysupertoon@gmail.com>
-pkgname="modsman"
-pkgver="0.32.1"
-pkgrel=3
-commithash="6add8e25be26080164cd4f84ce5338b8d98e4e4e"
-shorthash="g6add8e2"
+# Maintainer: Cranky Supertoon <crankysupertoon at gmail dot com>
+# Maintainer: Cobalt Space <cobaltspace at protonmail dot com>
+
+pkgname=modsman
+pkgver=0.32.1
+pkgrel=4
 arch=('x86_64')
 pkgdesc="Minecraft mod manager and updater for the CLI"
 url='https://github.com/sargunv/modsman'
 license=('GPL3')
-makedepends=('gendesk' 'unzip' 'git')
+makedepends=('gendesk' 'git' 'java-environment=8')
 depends=('java-runtime=8')
-conflicts=('modsman-git' 'modsman-bin')
-source=("${pkgname}::git+${url}.git")
+source=("$pkgname::git+$url.git#tag=$pkgver")
 md5sums=('SKIP')
 
-prepare() {
-    #Rebase project to proper commit
-    #because the project cannot be built dirty
-    cd "${srcdir}/${pkgname}"
-    git reset --hard ${commithash}
-
-    # Create Startup Script
-    cat > "${pkgname}-app" <<-EOT
-#!/bin/sh
-cd /opt/modsman/bin
-./modsman-cli
-EOT
-}
-
 build() {
-    cd "${srcdir}/${pkgname}"
-    ./gradlew :${pkgname}-cli:distZip --info --stacktrace
+    cd "$srcdir/$pkgname"
+    JAVA_HOME=/usr/lib/jvm/java-8-openjdk ./gradlew :$pkgname-cli:installDist --info --stacktrace
 }
 
 package() {
-
-    # Unzip Compiled project
-    cd "${srcdir}/${pkgname}/${pkgname}-cli/build/distributions"
-    unzip -o ${pkgname}-cli-${pkgver}-1-${shorthash}.dirty.zip
-    rm -rf "${pkgname}/"
-    cp -r "${pkgname}-cli-${pkgver}-1-${shorthash}.dirty/" "${pkgname}/"
-    rm -f "modsman/bin/${pkgname}-cli.bat"
-
-    # install the main files.
-    install -d -m755 "${pkgdir}/opt/${pkgname}"
-    cp -Rr "${srcdir}/${pkgname}/modsman-cli/build/distributions/modsman" "${pkgdir}/opt/"
-
-    # fix file permissions - all files as 644 - directories as 755
-    find "${pkgdir}/"opt -type d -exec chmod 755 {} \;
-    find "${pkgdir}/"opt -type f -exec chmod 644 {} \;
-
-    # link the binary
-    install -d -m755 "${pkgdir}/usr/bin"
-    cp -Rr "${srcdir}/${pkgname}/${pkgname}-app" "${pkgdir}/usr/bin/${pkgname}"
-
-    # make sure the main binary has the right permissions
-    chmod +x "${pkgdir}/usr/bin/${pkgname}"
-    chmod +x "${pkgdir}/opt/${pkgname}/bin/${pkgname}-cli"
+    # remove windows command
+    rm "$srcdir/$pkgname/$pkgname-cli/build/install/$pkgname-cli/bin/$pkgname-cli.bat"
+    # create installation directory
+    mkdir -p $pkgdir/opt/
+    cp -r "$srcdir/$pkgname/$pkgname-cli/build/install/$pkgname-cli/" $pkgdir/opt/$pkgname
+    # create symbolic link to command
+    mkdir -p $pkgdir/usr/bin/
+    ln -s ../../opt/$pkgname/bin/$pkgname-cli $pkgdir/usr/bin/$pkgname
 }