Updated files according to Scimmia's suggestions

1 files changed, 13 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9cb5af54ef87..2780ffbd7ccb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,30 @@
 # Maintainer: Patrick Darwinkel <patrick@darwinkel.net>
 pkgname=ogar-git
 pkgver=git
-pkgrel=3
-pkgdesc="A fully functional open source Agar.io server implementation, written in Node.js."
+pkgrel=4
+pkgdesc="An open source Agar.io server implementation, written with Node.js."
 arch=(any)
-url="https://github.com/forairan/Ogar"
+url="https://github.com/OgarProject/Ogar"
 license=('Apache')
 depends=('nodejs' 'npm' 'git' 'systemd')
-conflicts=('ogar')
-source=('git+https://github.com/forairan/Ogar.git' 'ogar.service')
+source=('git+https://github.com/OgarProject/Ogar' 'ogar.service')
 sha256sums=('SKIP' 'f41103fe9323c16d8677f436a23bcd06e76988172ea82c345366bceff01f6cb8')
 install="${pkgname}.install"
 backup=('usr/share/ogar/gameserver.ini')
 
 pkgver() {
   cd Ogar
-  git rev-parse --verify HEAD
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 package() {
-	cd $srcdir
-	mv Ogar ogar
-	mkdir -p $pkgdir/usr/share
-	mv ogar $pkgdir/usr/share/ogar
-#	rm -R $pkgdir/usr/share/ogar/bin
-#	rm $pkgdir/usr/share/ogar/Launch.bat
-	rm $pkgdir/usr/share/ogar/src/Start.bat
-	rm $pkgdir/usr/share/ogar/.gitignore
-	rm $pkgdir/usr/share/ogar/ogar-linux-script.sh
-	chmod -R 755 $pkgdir/usr/share/ogar
-
+	cd "$srcdir"
+	cp -RTf Ogar ogar
+	install -dm 755 "$pkgdir/usr/share"
+	cp -RTf ogar "$pkgdir/usr/share/ogar"
+	cd "$pkgdir/usr/share/ogar"
+	rm -Rf .gitignore src/Start.bat ogar-linux-script.sh .git
+	cd "$srcdir"
 	install -Dm 644 "ogar.service" "${pkgdir}/usr/lib/systemd/system/ogar.service"
-
+	
 }