Added detached signature file and GPG key. - Minor code clean up (second attempt).

2 files changed, 13 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09f379ad6ef6..9d00ae86b0a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ttf-moderndos
 	pkgdesc = A raster monospace serif based on IBM and Verite, extracted from VGA ROM typefaces in real machines by various manufacturers.
 	pkgver = 2018.09.29
-	pkgrel = 1.2
+	pkgrel = 1.3
 	url = https://notabug.org/HarvettFox96/ttf-moderndos
 	arch = any
 	license = CC0
@@ -9,7 +9,9 @@ pkgbase = ttf-moderndos
 	depends = xorg-font-utils
 	depends = xorg-fonts-encodings
 	source = https://notabug.org/HarvettFox96/ttf-moderndos/archive/2018.09.29-1.tar.gz
+	source = 2018.09.29-1.tar.gz.sig::https://notabug.org/attachments/867df282-014d-4397-9dd4-cfbdf9330387
 	sha512sums = 0d35ff15a82f441c69aaefa5644ee394dfcd974c55fb3c51aa692551b84c5496b19622aa81770438694a4deb4ac409f81b11256011c2fc527e5af5a84d38f23b
+	sha512sums = SKIP
 
 pkgname = ttf-moderndos
 
diff --git a/PKGBUILD b/PKGBUILD
index fcf5fa2de003..dab21ce6240f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,25 +2,27 @@
 
 pkgname=ttf-moderndos
 pkgver=2018.09.29
-_rel=1
-pkgrel=1.2
+pkgrel=1.3
+_gitver=${pkgver}-1
 pkgdesc="A raster monospace serif based on IBM and Verite, extracted from VGA ROM typefaces in real machines by various manufacturers."
 url="https://notabug.org/HarvettFox96/${pkgname}"
-arch=("any")
 license=("CC0")
+arch=("any")
 depends=("fontconfig" "xorg-font-utils" "xorg-fonts-encodings")
-source=("https://notabug.org/HarvettFox96/${pkgname}/archive/${pkgver}-${_rel}.tar.gz")
-sha512sums=("0d35ff15a82f441c69aaefa5644ee394dfcd974c55fb3c51aa692551b84c5496b19622aa81770438694a4deb4ac409f81b11256011c2fc527e5af5a84d38f23b")
+source=("https://notabug.org/HarvettFox96/${pkgname}/archive/${_gitver}.tar.gz"
+        "${_gitver}.tar.gz.sig::https://notabug.org/attachments/867df282-014d-4397-9dd4-cfbdf9330387")
+sha512sums=("0d35ff15a82f441c69aaefa5644ee394dfcd974c55fb3c51aa692551b84c5496b19622aa81770438694a4deb4ac409f81b11256011c2fc527e5af5a84d38f23b"
+            "SKIP")
+verifypgpkeys=("925C741082DC0DB32CF8AADFCB73A6EB26948E91")
 
 prepare() {
-  tar -zxvf ${pkgver}-${_rel}.tar.gz;
+  tar -zxvf ${_gitver}.tar.gz;
   mv -v ${pkgname}/{LICENSE,ttf/*.ttf} "${srcdir}/";
-  rm -frv ${pkgname}/;
 }
 
 package() {
   install -dm755 "${pkgdir}/usr/share/fonts/TTF/";
   install -Dm644 *.ttf "${pkgdir}/usr/share/fonts/TTF/";
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE";
-  rm -v "${srcdir}/"*;
+  rm -frv "${srcdir}/"*;
 }