Better PKGBUILD…

- replace gendesk with .desktop-file
- use a template for opsu and opsu-git
- inlude missing dependency `hicolor-icon-theme`
- remove pkgver() (why is it even in there?)
- keep gradle inside the `${srcdir}`
- remove reference to `${startdir}`

5 files changed, 46 insertions, 114 deletions

diff --git a/.CHANGELOG b/.CHANGELOG
deleted file mode 100644
index 0db55f924019..000000000000
--- a/.CHANGELOG
+++ /dev/null
@@ -1,76 +0,0 @@
-* commit 8300af97c1a5fe340fef13bf0e5bd426ddf154aa
-| Author: Jeffrey Han <itdelatrisu@gmail.com>
-| Date:   Sun Jul 2 23:34:40 2017 -0400
-| 
-|     Added Ripple download server.
-|     
-|     Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
-| 
-* commit cf52c2f2eaf42244b2d0071faefff1485a087fb7
-| Author: Jeffrey Han <itdelatrisu@gmail.com>
-| Date:   Sun Jul 2 13:27:24 2017 -0400
-| 
-|     Updating to 0.16.0.
-|     
-|     Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
-| 
-* commit 7f66b6aa5756fcd715bfc8d34727709f39f6ee0d
-| Author: Jeffrey Han <itdelatrisu@gmail.com>
-| Date:   Sun Jul 2 01:06:54 2017 -0400
-| 
-|     Added contributing guidelines. (#300)
-|     Based on the document by @tpenguinltg.
-|     
-|     Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
-| 
-* commit 212a39507d5fd3cfbc0b0a62a18d723a4a49fe70
-| Author: Jeffrey Han <itdelatrisu@gmail.com>
-| Date:   Sat Jul 1 23:00:07 2017 -0400
-| 
-|     Clamp volume levels for hit sounds. (fixes #306)
-|     
-|     Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
-| 
-* commit ab39b3e21a107c9360e7916d9aec3323b144b4bb
-| Author: Jeffrey Han <itdelatrisu@gmail.com>
-| Date:   Sat Jul 1 19:38:57 2017 -0400
-| 
-|     Enable BloodcatServer, download by opening a web browser. (#277, #278)
-|     Download beatmaps in a browser and tell the user where to put/move the files. Falls back on copying the download URL to the clipboard.
-|     
-|     Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
-| 
-* commit 481b3a1e40f6c870887cd133d464519a603b0804
-| Author: Jeffrey Han <itdelatrisu@gmail.com>
-| Date:   Sat Jul 1 17:54:21 2017 -0400
-| 
-|     Follow-up to #307 (minor code style changes).
-|     
-|     Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
-|   
-*   commit da5a366effdec1c8dd977e397a9fa32887338385
-|\  Merge: d6284a4 2addaa6
-| | Author: Jeffrey Han <itdelatrisu@users.noreply.github.com>
-| | Date:   Sat Jul 1 17:42:01 2017 -0400
-| | 
-| |     Merge pull request #307 from yugecin/keyoverlay
-| |     
-| |     Key overlay
-| | 
-| * commit 2addaa69ef3ae89bc961fb938d46bf13873b2a3e
-| | Author: yugecin <yugecin@users.noreply.github.com>
-| | Date:   Sat Jul 1 23:25:43 2017 +0200
-| | 
-| |     remove wildcard import
-| | 
-| * commit fb96ff3a13ae5254036a461be42ca4a3a04f9d24
-| | Author: yugecin <yugecin@users.noreply.github.com>
-| | Date:   Sat Jul 1 23:23:42 2017 +0200
-| | 
-| |     don't reset key overlay when resuming paused game
-| | 
-| * commit 52d5608dcb46b0bea71732c9b06bdbafc94889b3
-| | Author: yugecin <yugecin@users.noreply.github.com>
-| | Date:   Sat Jul 1 23:12:17 2017 +0200
-| | 
-| |     move InputOverlayKey class to separate file
diff --git a/.SRCINFO b/.SRCINFO
index 9c04d293da54..e803209bd722 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,28 @@
-# Generated by mksrcinfo v8
-# Mon Jul  3 11:46:56 UTC 2017
 pkgbase = opsu-git
 	pkgdesc = An open source osu!-client written in Java.
 	pkgver = 0.16.0.r0.gcf52c2f
-	pkgrel = 1
+	pkgrel = 2
 	url = https://itdelatrisu.github.io/opsu/
-	install = opsu-git.install
-	changelog = .CHANGELOG
+	install = opsu.install
 	arch = any
 	license = GPL3
 	makedepends = java-environment
 	makedepends = java-web-start
 	makedepends = gradle
-	makedepends = gendesk
 	makedepends = git
 	depends = java-runtime
 	depends = bash
+	depends = hicolor-icon-theme
 	depends = xorg-xrandr
 	optdepends = ffmpeg: Background video playback
 	provides = opsu
 	conflicts = opsu
-	source = opsu-git::git://github.com/itdelatrisu/opsu.git
+	source = opsu::git://github.com/itdelatrisu/opsu.git
 	source = opsu.sh
+	source = opsu.desktop
 	sha512sums = SKIP
 	sha512sums = 4b065052fef55e1860a51dfa5af080930b1001e4c82cd8b3b0383bd68b239d382d788408235a7cb4fb4a1d04123a6049188a2e2c2d0e5fd08a3deb69da25fc2d
+	sha512sums = 94f6f2f2a7f5f104e1002869099daf2bc033764373c8f51b204152d6821070e4be25a0001bfdb8b5b2ef25046b0be214f640de5ff994eda9126a48495104e745
 
 pkgname = opsu-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 2fed38c119d5..25303efc57ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,56 +1,55 @@
-# Maintainer: Lucki <Lucki at holarse-linuxgaming dot de>
+# Maintainer: Lucki <https://aur.archlinux.org/account/Lucki>
 # Contributor in comments: Misc <https://aur.archlinux.org/account/misc/>
 # Contributor in comments: SajeOne <https://aur.archlinux.org/account/SajeOne/>
 # Contributor in email: tpenguinltg <https://aur.archlinux.org/account/tpenguinltg/>
 
 pkgname=opsu-git
-_pkgname=opsu
 pkgver=0.16.0.r0.gcf52c2f
-pkgrel=1
-pkgdesc="An open source osu!-client written in Java."
-arch=('any')
-url="https://itdelatrisu.github.io/opsu/"
-license=('GPL3')
-changelog=.CHANGELOG
-install=opsu-git.install
-depends=('java-runtime' 'bash' 'xorg-xrandr')
-optdepends=('ffmpeg: Background video playback')
-makedepends=('java-environment' 'java-web-start' 'gradle' 'gendesk' 'git')
-provides=('opsu')
-conflicts=('opsu')
-source=(${pkgname}::git://github.com/itdelatrisu/opsu.git
-        opsu.sh )
+pkgrel=2
+install=${pkgname%-git}.install
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=("${pkgname%-git}::git://github.com/itdelatrisu/opsu.git"
+        "${pkgname%-git}.sh"
+        "${pkgname%-git}.desktop")
 sha512sums=('SKIP'
-            '4b065052fef55e1860a51dfa5af080930b1001e4c82cd8b3b0383bd68b239d382d788408235a7cb4fb4a1d04123a6049188a2e2c2d0e5fd08a3deb69da25fc2d')
+            '4b065052fef55e1860a51dfa5af080930b1001e4c82cd8b3b0383bd68b239d382d788408235a7cb4fb4a1d04123a6049188a2e2c2d0e5fd08a3deb69da25fc2d'
+            '94f6f2f2a7f5f104e1002869099daf2bc033764373c8f51b204152d6821070e4be25a0001bfdb8b5b2ef25046b0be214f640de5ff994eda9126a48495104e745')
 
 pkgver()
 {
-	cd "${srcdir}/${pkgname}"
+	cd "${srcdir}/${pkgname%-git}"
 	git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare()
-{
-	# generate .desktop-file
-	gendesk -n -f --pkgname "${_pkgname}" --pkgdesc "$pkgdesc" --name "opsu!" --exec "${_pkgname}" --categories "Game"
-
-	# update .CHANGELOG
-	git -C "${srcdir}/${pkgname}" log --graph -10 > "${startdir}/.CHANGELOG"
-}
+_pkgname=${pkgname%-git}
+# template start; name=opsu; version=0.2;
+pkgdesc="An open source osu!-client written in Java."
+arch=('any')
+url="https://itdelatrisu.github.io/opsu/"
+license=('GPL3')
+depends=('java-runtime' 'bash' 'hicolor-icon-theme'
+		 'xorg-xrandr' # is a dependency for LWJGL. Had to search around for the fix after the application was throwing an unhandled exception because it couldn't detect monitors. Any chance this could be added to the dep list? - https://aur.archlinux.org/account/SajeOne
+		 )
+optdepends=('ffmpeg: Background video playback')
+makedepends=('java-environment' 'java-web-start' 'gradle' 'git')
 
 build()
 {
-	cd "${srcdir}/${pkgname}"
-	gradle jar -PXDG=true -PexcludeFFmpeg
+	cd "${srcdir}/${_pkgname}"
+	
+	# keep dependencies outside users home by setting GRADLE_USER_HOME
+	GRADLE_USER_HOME=. gradle jar -PXDG=true -PexcludeFFmpeg
 }
 
 package()
 {
 	# cut pkgver
-	_pkgver=$(git -C "${srcdir}/${pkgname}" describe --tags | sed 's/-.*//')
+	_pkgver=$(git -C "${srcdir}/${_pkgname}" describe --tags | sed 's/-.*//')
 
-	install -Dm644 "${srcdir}/${pkgname}/build/libs/${_pkgname}-${_pkgver}.jar" "${pkgdir}/usr/share/java/${_pkgname}/${_pkgname}.jar"
-	install -Dm644 "${srcdir}/${pkgname}/res/logo.png" "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
+	install -Dm644 "${srcdir}/${_pkgname}/build/libs/${_pkgname}-${_pkgver}.jar" "${pkgdir}/usr/share/java/${_pkgname}/${_pkgname}.jar"
+	install -Dm644 "${srcdir}/${_pkgname}/res/logo.png" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.png"
 	install -Dm644 "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
 	install -Dm755 "${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}"
 }
+# template end;
diff --git a/opsu.desktop b/opsu.desktop
new file mode 100644
index 000000000000..f7ccc409a6e2
--- /dev/null
+++ b/opsu.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Opsu!
+Comment=An open source osu!-client written in Java.
+Exec=opsu
+Icon=opsu
+Terminal=false
+StartupNotify=false
+Categories=Game;ActionGame;
diff --git a/opsu-git.install b/opsu.install
index 490e6177c129..490e6177c129 100644
--- a/opsu-git.install
+++ b/opsu.install