cleanups

2 files changed, 13 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6af279326c7d..ef0ed579eb60 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mrrescue
 	pkgdesc = An arcade styled 2d action game centered around evacuating civilians from burning buildings.
 	pkgver = 1.02c
-	pkgrel = 2
+	pkgrel = 3
 	url = http://tangramgames.dk/games/mrrescue/
 	arch = any
 	license = CCPL:by-sa
diff --git a/PKGBUILD b/PKGBUILD
index 3e2832f2ad7a..5e2c1ebe462c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,32 @@
 # Maintainer: Ainola
-# Contributor: Pio
+# Contributors: Pio, carstene1ns
 
 pkgname=mrrescue
 pkgver=1.02c
-pkgrel=2
+pkgrel=3
 pkgdesc="An arcade styled 2d action game centered around evacuating civilians from burning buildings."
 arch=('any')
 url="http://tangramgames.dk/games/mrrescue/"
 license=('CCPL:by-sa' 'zlib')
 depends=('love')
 makedepends=('gendesk')
-source=("https://github.com/SimonLarsen/mrrescue/releases/download/v${pkgver}/${pkgname}-${pkgver}.love")
+source=("https://github.com/SimonLarsen/mrrescue/releases/download/v$pkgver/$pkgname-$pkgver.love")
 md5sums=('85897f04f2e9c3aaded74bf178aeab4c')
 
-build() {
+prepare() {
+	cd $srcdir
 	# Generate desktop file
-	cd "${srcdir}"
-	gendesk -n
-
+	gendesk -f -n --name "Mr. Rescue" --pkgname "$pkgname" --pkgdesc "$pkgdesc"
 	# Generate run script
-	echo -e "#!/bin/sh\nlove /usr/share/mrrescue/mrrescue-${pkgver}.love" > "${pkgname}.sh"
+	echo -e "#!/bin/sh\nexec love /usr/share/$pkgname/$pkgname-$pkgver.love" > $pkgname.sh
 }
 
 package() {
 	# Copy game and license
-	cd "${srcdir}" #/${pkgname}-${pkgver}-love"
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -Dm644 "${pkgname}-${pkgver}.love" "${pkgdir}/usr/share/${pkgname}/${pkgname}-${pkgver}.love"
-	# Extract an image to be used as icon
-	unzip -p "${pkgname}-${pkgver}.love" data/splash.png > mrrescue.png
+	install -Dm0644 "$pkgname-$pkgver.love" "$pkgdir"/usr/share/$pkgname/$pkgname-$pkgver.love
+	install -Dm0644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 	# Copy desktop file, icon and run script
-	install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-	install -Dm644 "${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-	install -D "${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+	install -Dm0644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
+	install -Dm0644 data/splash.png "$pkgdir"/usr/share/pixmaps/$pkgname.png
+	install -Dm0755 $pkgname.sh "$pkgdir"/usr/bin/$pkgname
 }