Rename target names to "mindustry" and more

- Target files / folders renamed "mindustry-git" => "mindustry"
- Provides and conflicts with "mindustry"
- Get rid of some unneeded absolute paths
  /usr/bin/mindustry => mindustry
  /usr/bin/java => java
- Update icon, custom based on logo

7 files changed, 32 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a7f048828977..d71b392d2b35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mindustry-git
 	pkgdesc = A sandbox tower defense game written in Java
-	pkgver = r4618.5a0669d43
+	pkgver = r5344.ff2d9c34f
 	pkgrel = 1
 	url = https://github.com/Anuken/Mindustry
 	arch = any
@@ -8,14 +8,16 @@ pkgbase = mindustry-git
 	makedepends = git
 	makedepends = java-environment=8
 	depends = java-runtime=8
-	source = mindustry-git::git://github.com/Anuken/Mindustry.git
-	source = mindustry-git.desktop
-	source = mindustry-git.png
-	source = mindustry-git.sh
+	provides = mindustry
+	conflicts = mindustry
+	source = mindustry::git://github.com/Anuken/Mindustry.git
+	source = mindustry.desktop
+	source = mindustry.png
+	source = mindustry.sh
 	md5sums = SKIP
-	md5sums = 9d28943fc8daa46d3552bce3cffaba57
-	md5sums = 08674801f873e782f96029c0f655f0b3
-	md5sums = f1d39bc76c71e641cd84739a77c08ab9
+	md5sums = 5cbcd7783b438452f494b34799dbea65
+	md5sums = 87e1a2c19d319f1eaef6c1a2920672d2
+	md5sums = 3c3fd3a7851992656c45feaf1ccdc4ca
 
 pkgname = mindustry-git
 
diff --git a/PKGBUILD b/PKGBUILD
index b86f1ca169eb..1caec4987ad1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,38 @@
 # Maintainer: copygirl <copygirl@mcft.net>
-pkgname=mindustry-git
-pkgver=r4618.5a0669d43
+_pkgname=mindustry
+pkgname=$_pkgname-git
+pkgver=r5344.ff2d9c34f
 pkgrel=1
 pkgdesc="A sandbox tower defense game written in Java"
 arch=("any")
 url="https://github.com/Anuken/Mindustry"
 license=("MIT")
+provides=("$_pkgname")
+conflicts=("$_pkgname")
 depends=("java-runtime=8")
 makedepends=("git" "java-environment=8")
-source=("$pkgname::git://github.com/Anuken/Mindustry.git"
-        "mindustry-git.desktop"
-        "mindustry-git.png"
-        "mindustry-git.sh")
+source=("$_pkgname::git://github.com/Anuken/Mindustry.git"
+        "mindustry.desktop"
+        "mindustry.png"
+        "mindustry.sh")
 md5sums=("SKIP"
-         "9d28943fc8daa46d3552bce3cffaba57"
-         "08674801f873e782f96029c0f655f0b3"
-         "f1d39bc76c71e641cd84739a77c08ab9")
+         "5cbcd7783b438452f494b34799dbea65"
+         "87e1a2c19d319f1eaef6c1a2920672d2"
+         "3c3fd3a7851992656c45feaf1ccdc4ca")
 
 pkgver() {
-	cd "$pkgname"
+	cd "$_pkgname"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-	cd "$pkgname"
+	cd "$_pkgname"
 	./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/Mindustry.jar "$pkgdir"/usr/share/java/"$pkgname"/Mindustry.jar
+	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/Mindustry.jar "$pkgdir"/usr/share/java/"$_pkgname"/Mindustry.jar
 }
diff --git a/mindustry-git.png b/mindustry-git.png
deleted file mode 100644
index 81191cf44011..000000000000
--- a/mindustry-git.png
+++ /dev/null
diff --git a/mindustry-git.sh b/mindustry-git.sh
deleted file mode 100755
index 7ae72ebd7cdb..000000000000
--- a/mindustry-git.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-NAME=mindustry-git
-cd ${XDG_DATA_HOME:"$HOME/.local/share"}/"$NAME"
-exec /usr/bin/java -jar /usr/share/java/$NAME/Mindustry.jar "$@"
diff --git a/mindustry-git.desktop b/mindustry.desktop
index 670ca5141369..dcd9ee0bb9dd 100644
--- a/mindustry-git.desktop
+++ b/mindustry.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Type=Application
 Name=Mindustry (Git)
 Comment=A pixelated sandbox tower defense game
-Exec=/usr/bin/mindustry-git
-Icon=/usr/share/pixmaps/mindustry-git.png
+Exec=mindustry
+Icon=/usr/share/pixmaps/mindustry.png
 Categories=Game;
 Terminal=false
diff --git a/mindustry.png b/mindustry.png
new file mode 100644
index 000000000000..285520fa0f27
--- /dev/null
+++ b/mindustry.png
diff --git a/mindustry.sh b/mindustry.sh
new file mode 100755
index 000000000000..4a8ef9ce1026
--- /dev/null
+++ b/mindustry.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec java -jar /usr/share/java/mindustry/Mindustry.jar "$@"