Correctly increment pkgrel. Tidy package function

2 files changed, 7 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index abe4c80fb483..3b0d1dbd0d31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = office-code-pro
 	pkgdesc = Customized version of Source Code Pro
 	pkgver = 1.004
-	pkgrel = 1
+	pkgrel = 3
 	url = https://github.com/nathco/Office-Code-Pro
 	arch = any
 	license = custom: SIL Open Font License 1.1
diff --git a/PKGBUILD b/PKGBUILD
index 44f54deb5209..6d809980a1da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=Office-Code-Pro
 pkgname=${_pkgname,,}
 pkgver=1.004
-pkgrel=1
+pkgrel=3
 pkgdesc='Customized version of Source Code Pro'
 arch=('any')
 url='https://github.com/nathco/Office-Code-Pro'
@@ -13,10 +13,11 @@ source=("${_pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
 sha256sums=('9bca923d17f6c47a586d8e4567d46ccfa58fb8b8e2247b5ee2a19da1597c58f6')
 
 package() {
-  install -Dm644 -t "${pkgdir}/usr/share/fonts/OTF" "${_pkgname}-${pkgver}/Fonts/Office Code Pro/OTF/"*.otf
-  install -Dm644 -t "${pkgdir}/usr/share/fonts/OTF" "${_pkgname}-${pkgver}/Fonts/Office Code Pro D/OTF/"*.otf
-  install -Dm644 "${_pkgname}-${pkgver}/README.md" "${pkgdir}/usr/share/doc/${pkgname}/README.md"
-  install -Dm644 "${_pkgname}-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd "${_pkgname}-${pkgver}"
+  install -Dm644 -t "${pkgdir}/usr/share/fonts/OTF" "Fonts/${_pkgname//-/ }/OTF/"*.otf
+  install -Dm644 -t "${pkgdir}/usr/share/fonts/OTF" "Fonts/${_pkgname//-/ } D/OTF/"*.otf
+  install -Dm644 -t "${pkgdir}/usr/share/doc/${pkgname}" 'README.md'
+  install -Dm644 'LICENSE.txt' "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et: