fix pkgver directory

2 files changed, 27 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2826530ecb6c..002f3f019609 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = armagetronad-git
 	pkgdesc = A Tron Clone in 3D.
 	pkgver = r4128.7392b902f
-	pkgrel = 4
+	pkgrel = 5
 	url = http://armagetronad.net/
 	arch = x86_64
 	license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index 863173c76580..f1f3d6c929dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 _pkgname=armagetronad
 pkgname=${_pkgname}-git
 pkgver='r4128.7392b902f'
-pkgrel=4
+pkgrel=5
 pkgdesc='A Tron Clone in 3D.'
 arch=('x86_64')
 url='http://armagetronad.net/'
@@ -21,39 +21,38 @@ source=("git+https://gitlab.com/armagetronad/armagetronad.git")
 sha1sums=('SKIP')
 
 pkgver() {
-  cd "$pkgname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd "${srcdir}/${_pkgname}"
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare(){
-     cd "${srcdir}/${_pkgname}"
-
-     # python2 fix
-     sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' language/update.py
+    cd "${srcdir}/${_pkgname}"
+    # python2 fix
+    sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' language/update.py
 }
 
 build() {
-     cd "${srcdir}/${_pkgname}"
-
-     ./bootstrap.sh
-
-     ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --mandir=/usr/share/man \
-        --disable-games \
-        --enable-automakedefaults \
-        --disable-uninstall
-     make
+    cd "${srcdir}/${_pkgname}"
+    
+    ./bootstrap.sh
+    
+    ./configure --prefix=/usr \
+       --sysconfdir=/etc \
+       --mandir=/usr/share/man \
+       --disable-games \
+       --enable-automakedefaults \
+       --disable-uninstall
+    make
 }
 
 package() {
-     cd "${srcdir}/${_pkgname}"
-     make DESTDIR="${pkgdir}" install
-     install -D -m 644 "desktop/${_pkgname}-armagetronad.desktop" "${pkgdir}/usr/share/applications/${_pkgname}-armagetronad.desktop"
-     install -d "${pkgdir}/usr/share/pixmaps/"
-     ln -s /usr/share/armagetronad/desktop/icons/large/armagetronad.png \
-           "${pkgdir}/usr/share/pixmaps/${_pkgname}-armagetronad.png"
-     mv "${pkgdir}/usr/bin/armagetronad" "${pkgdir}/usr/bin/armagetronad_bin"
-     printf "#!/bin/bash\n/usr/bin/armagetronad_bin --configdir /etc/armagetronad --datadir /usr/share/armagetronad" > "${pkgdir}/usr/bin/armagetronad"
-     chmod +x "${pkgdir}/usr/bin/armagetronad"
+    cd "${srcdir}/${_pkgname}"
+    make DESTDIR="${pkgdir}" install
+    install -D -m 644 "desktop/${_pkgname}-armagetronad.desktop" "${pkgdir}/usr/share/applications/${_pkgname}-armagetronad.desktop"
+    install -d "${pkgdir}/usr/share/pixmaps/"
+    ln -s /usr/share/armagetronad/desktop/icons/large/armagetronad.png \
+          "${pkgdir}/usr/share/pixmaps/${_pkgname}-armagetronad.png"
+    mv "${pkgdir}/usr/bin/armagetronad" "${pkgdir}/usr/bin/armagetronad_bin"
+    printf "#!/bin/bash\n/usr/bin/armagetronad_bin --configdir /etc/armagetronad --datadir /usr/share/armagetronad" > "${pkgdir}/usr/bin/armagetronad"
+    chmod +x "${pkgdir}/usr/bin/armagetronad"
 }