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}`

1 files changed, 30 insertions, 31 deletions

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;