Update and fix package

- Remove gradle dep (use wrapper instead)
- desktop-release.jar was renamed to Mindustry.jar

3 files changed, 10 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8546a58d5b7c..09201919156a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = mindustry-git
-	pkgdesc = A pixelated sandbox tower defense game
-	pkgver = r674.55ae4c6
+	pkgdesc = A sandbox tower defense game written in Java
+	pkgver = r4398.233ae99d3
 	pkgrel = 1
 	url = https://github.com/Anuken/Mindustry
 	arch = any
 	license = MIT
 	makedepends = git
 	makedepends = java-environment>=8
-	makedepends = gradle
 	depends = java-runtime>=8
 	source = mindustry-git::git://github.com/Anuken/Mindustry.git
 	source = mindustry-git.desktop
@@ -16,7 +15,7 @@ pkgbase = mindustry-git
 	md5sums = SKIP
 	md5sums = 9d28943fc8daa46d3552bce3cffaba57
 	md5sums = 08674801f873e782f96029c0f655f0b3
-	md5sums = bb183ee1b54f1fa25e31647e5aab053e
+	md5sums = f1d39bc76c71e641cd84739a77c08ab9
 
 pkgname = mindustry-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 612ec65c2b76..ac393b1ad1b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: copygirl <copygirl@mcft.net>
 pkgname=mindustry-git
-pkgver=r674.55ae4c6
+pkgver=r4398.233ae99d3
 pkgrel=1
-pkgdesc="A pixelated sandbox tower defense game"
+pkgdesc="A sandbox tower defense game written in Java"
 arch=("any")
 url="https://github.com/Anuken/Mindustry"
 license=("MIT")
 depends=("java-runtime>=8")
-makedepends=("git" "java-environment>=8" "gradle")
+makedepends=("git" "java-environment>=8")
 source=("$pkgname::git://github.com/Anuken/Mindustry.git"
         "mindustry-git.desktop"
         "mindustry-git.png"
@@ -15,7 +15,7 @@ source=("$pkgname::git://github.com/Anuken/Mindustry.git"
 md5sums=("SKIP"
          "9d28943fc8daa46d3552bce3cffaba57"
          "08674801f873e782f96029c0f655f0b3"
-         "bb183ee1b54f1fa25e31647e5aab053e")
+         "f1d39bc76c71e641cd84739a77c08ab9")
 
 pkgver() {
 	cd "$pkgname"
@@ -24,12 +24,12 @@ pkgver() {
 
 build() {
 	cd "$pkgname"
-	gradle desktop:dist
+	./gradlew desktop:dist
 }
 
 package() {
 	install -Dm755 "$pkgname".sh "$pkgdir"/usr/bin/"$pkgname"
 	install -Dm644 "$pkgname".png "$pkgdir"/usr/share/pixmaps/"$pkgname".png
 	install -Dm644 "$pkgname".desktop "$pkgdir"/usr/share/applications/"$pkgname".desktop
-	install -Dm755 "$pkgname"/desktop/build/libs/desktop-release.jar "$pkgdir"/usr/share/java/"$pkgname"/desktop-release.jar
+	install -Dm755 "$pkgname"/desktop/build/libs/Mindustry.jar "$pkgdir"/usr/share/java/"$pkgname"/Mindustry.jar
 }
diff --git a/mindustry-git.sh b/mindustry-git.sh
index 0074ce182f26..7ae72ebd7cdb 100755
--- a/mindustry-git.sh
+++ b/mindustry-git.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 NAME=mindustry-git
 cd ${XDG_DATA_HOME:"$HOME/.local/share"}/"$NAME"
-exec /usr/bin/java -jar /usr/share/java/$NAME/desktop-release.jar "$@"
+exec /usr/bin/java -jar /usr/share/java/$NAME/Mindustry.jar "$@"