Cleaned up PKGBUILD. Updated to latest version

Got rid of custom variable.
Enclosed all variables in quotes.
Changed PKGVER function to use upstream versioning scheme

Signed-off-by: Matthew Sexton <wsdmatty@gmail.com>

2 files changed, 16 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 075d8eca141d..b79d91e87f70 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nano-syntax-highlighting-git
-	pkgdesc = Nano editor syntax highlighting enhancements
-	pkgver = 474.421a5c4
+	pkgdesc = improved nano syntax highlighting files
+	pkgver = 2019.10.17.r8.g6bee1b2
 	pkgrel = 1
 	url = https://github.com/scopatz/nanorc
 	install = nano-syntax-highlighting.install
@@ -10,7 +10,7 @@ pkgbase = nano-syntax-highlighting-git
 	depends = nano
 	provides = nano-syntax-highlighting
 	conflicts = nano-syntax-highlighting
-	source = nanorc::git+https://github.com/scopatz/nanorc.git#branch=master
+	source = nano-syntax-highlighting::git+https://github.com/scopatz/nanorc.git
 	md5sums = SKIP
 
 pkgname = nano-syntax-highlighting-git
diff --git a/PKGBUILD b/PKGBUILD
index 05d714e2e9ff..c2410c27eac1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,9 @@
-# Maintainer: American_Jesus <american.jesus.pt AT gmail DOT com>
-
-_pkgname=nano-syntax-highlighting
-pkgname=$_pkgname-git
-pkgver=474.421a5c4
+# Contributor: American_Jesus <american.jesus.pt AT gmail DOT com>
+# Maintainer: Matthew Sexton <wsdmatty@gmail.com>
+pkgname=nano-syntax-highlighting-git
+pkgver=2019.10.17.r8.g6bee1b2
 pkgrel=1
-pkgdesc="Nano editor syntax highlighting enhancements"
+pkgdesc="improved nano syntax highlighting files"
 arch=('any')
 depends=('nano')
 makedepends=('git')
@@ -13,27 +12,26 @@ license=('GPL3')
 install=nano-syntax-highlighting.install
 provides=('nano-syntax-highlighting')
 conflicts=('nano-syntax-highlighting')
-source=('nanorc::git+https://github.com/scopatz/nanorc.git#branch=master')
+source=('nano-syntax-highlighting::git+https://github.com/scopatz/nanorc.git')
 md5sums=('SKIP')
 
 pkgver() {
-	cd $srcdir/nanorc
-	echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+	cd "${srcdir}/${pkgname%-git}"
+	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+
 }
 
 build() {
 	# Generate nanorc.sample
-	find $srcdir/nanorc/*.nanorc -type f | sed "s@${srcdir}\/nanorc@include \/usr\/share\/$_pkgname@" > $srcdir/nanorc.sample
+	find "${srcdir}"/"${pkgname%-git}"/*.nanorc -type f | sed "s@${srcdir}\/${pkgname%-git}@include \/usr\/share\/${pkgname%-git}@" > "${srcdir}/nanorc.sample"
 }
 
 package() {
-	cd $srcdir
-	
-	mkdir -p $pkgdir/usr/share/$_pkgname
+	mkdir -p "${pkgdir}/usr/share/${pkgname%-git}"
 	
-	find $srcdir/nanorc/ -name '*.nanorc' | xargs install -D -m644 -t $pkgdir/usr/share/$_pkgname/
+	find "${srcdir}"/"${pkgname%-git}"/ -name '*.nanorc' | xargs install -D -m644 -t "${pkgdir}/usr/share/${pkgname%-git}/"
 	
-	install -D -m644 $srcdir/nanorc.sample $pkgdir/usr/share/$_pkgname/nanorc.sample
+	install -D -m644 "${srcdir}/nanorc.sample" "${pkgdir}/usr/share/${pkgname%-git}/nanorc.sample"
 
 }