update 1.1.0

2 files changed, 25 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2fca00b65b66..0634d5516e80 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,26 @@
 pkgbase = smiley-sans-bin
 	pkgdesc = 得意黑 Smiley Sans
-	pkgver = 1.0.0
+	pkgver = 1.1.0
 	pkgrel = 1
 	url = https://github.com/atelier-anchor/smiley-sans
 	arch = any
 	license = OFL
-	source = smiley-sans-v1.0.0.zip::https://github.com/atelier-anchor/smiley-sans/releases/download/v1.0.0/smiley-sans-v1.0.0.zip
-	source = LICENSE::https://github.com/atelier-anchor/smiley-sans/raw/main/LICENSE
-	sha512sums = e233b4af5d95c6c94319d096b612539b37a1c80d05391b684665bb324f60bcdef23f3f9e6a58d721459bf9cc26133463028000a5124a9921cfa0f39f8ed6ff56
-	sha512sums = 94f0ca7615da9f263c6b612c8db0fc969150610514534bbfce2709216261020a072b59f6ce40c7cf3e63a54d29e1997a6aff89c02cf2562e2a8087cce3621489
+	source = smiley-sans-1.1.0.zip::https://github.com/atelier-anchor/smiley-sans/releases/download/v1.1.0/smiley-sans-v1.1.0.zip
+	source = LICENSE::https://github.com/atelier-anchor/smiley-sans/raw/v1.1.0/LICENSE
+	sha512sums = 4c1fac35d384f8169f3a810bf2df4e69577029c240eab1046f1daa8b95a761f809ba9e7d83dd129f5007bc86c5ca4e8894b969ac2e9e773e73aa751f39b5aa4a
+	sha512sums = f5d63f0427d68c9414779119477f1c0ca0c51d6fc7e349934a32d85b0aa15d63a1f56a313f9b41daec25ae63e482ad3f73fc45414b21d40e0e93addb11f47db6
 
 pkgname = otf-smiley-sans-bin
 	pkgdesc = 得意黑 Smiley Sans (otf)
+	provides = otf-smiley-sans
 	conflicts = otf-smiley-sans
 
 pkgname = ttf-smiley-sans-bin
 	pkgdesc = 得意黑 Smiley Sans (ttf)
+	provides = ttf-smiley-sans
 	conflicts = ttf-smiley-sans
 
 pkgname = woff2-smiley-sans-bin
 	pkgdesc = 得意黑 Smiley Sans (woff2)
+	provides = woff2-smiley-sans
 	conflicts = woff2-smiley-sans
diff --git a/PKGBUILD b/PKGBUILD
index 0bfbb72b4fbe..fd2e47cf61d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,51 +2,34 @@
 
 _pkgbase='smiley-sans'
 pkgbase="${_pkgbase}-bin"
-pkgname=("otf-${pkgbase}" "ttf-${pkgbase}" "woff2-${pkgbase}")
-pkgver=1.0.0
+pkgname=({otf,ttf,woff2}-${pkgbase})
+pkgver=1.1.0
 pkgrel=1
 pkgdesc='得意黑 Smiley Sans'
 url='https://github.com/atelier-anchor/smiley-sans'
 license=('OFL')
 arch=('any')
 
-source=("${_pkgbase}-v${pkgver}.zip::${url}/releases/download/v${pkgver}/${_pkgbase}-v${pkgver}.zip"
-        "LICENSE::${url}/raw/main/LICENSE")
+source=("${_pkgbase}-${pkgver}.zip::${url}/releases/download/v${pkgver}/${_pkgbase}-v${pkgver}.zip"
+        "LICENSE::${url}/raw/v${pkgver}/LICENSE")
 
-sha512sums=('e233b4af5d95c6c94319d096b612539b37a1c80d05391b684665bb324f60bcdef23f3f9e6a58d721459bf9cc26133463028000a5124a9921cfa0f39f8ed6ff56'
-            '94f0ca7615da9f263c6b612c8db0fc969150610514534bbfce2709216261020a072b59f6ce40c7cf3e63a54d29e1997a6aff89c02cf2562e2a8087cce3621489')
+sha512sums=('4c1fac35d384f8169f3a810bf2df4e69577029c240eab1046f1daa8b95a761f809ba9e7d83dd129f5007bc86c5ca4e8894b969ac2e9e773e73aa751f39b5aa4a'
+            'f5d63f0427d68c9414779119477f1c0ca0c51d6fc7e349934a32d85b0aa15d63a1f56a313f9b41daec25ae63e482ad3f73fc45414b21d40e0e93addb11f47db6')
 
-package_otf-smiley-sans-bin() {
-  # tags
-  pkgdesc+=" (otf)"
-  conflicts=('otf-smiley-sans')
-
-  # font files
-  cd "${srcdir}/"
-  install -Dm644 -t "${pkgdir}/usr/share/fonts/${_pkgbase}" *.otf
-
-  # license
-  install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_ttf-smiley-sans-bin() {
-  pkgdesc+=" (ttf)"
-  conflicts=('ttf-smiley-sans')
-
-  cd "${srcdir}/"
-  install -Dm644 -t "${pkgdir}/usr/share/fonts/${_pkgbase}" *.ttf
+_package() {
+  pkgdesc+=" (${pkgname%-${pkgbase}})"
+  provides=(${pkgname%-bin})
+  conflicts=(${pkgname%-bin})
 
+  install -Dm644 -t "${pkgdir}/usr/share/fonts/${_pkgbase}" ${srcdir}/*.${pkgname%-${pkgbase}}
   install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
-package_woff2-smiley-sans-bin() {
-  pkgdesc+=" (woff2)"
-  conflicts=('woff2-smiley-sans')
-
-  cd "${srcdir}/"
-  install -Dm644 -t "${pkgdir}/usr/share/fonts/${_pkgbase}" *.woff2
-
-  install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
+for _pkgname in "${pkgname[@]}"; do
+  eval "package_${_pkgname}() {
+    $(declare -f "_package")
+    _package
+  }"
+done
 
 # vim:set ts=2 sw=2 et:
\ No newline at end of file