1 files changed, 21 insertions, 27 deletions
diff --git a/comic-neue/PKGBUILD b/comic-neue/PKGBUILD
index 856ea40..b1e2385 100644
--- a/comic-neue/PKGBUILD
+++ b/comic-neue/PKGBUILD
@@ -15,36 +15,30 @@ source=("${url}/${pkgbase}-${pkgver}.zip"
 sha256sums=('54dd998c93b8d6658b1c2d6ade9f790d10ffaa3632868dd2cfac84b405290321'
             'c30876b732eaf4b6491642a53651b31259ba36308c4e668b1e37ad2c8ad86088')
 
-function _package {
+package_ttf-comic-neue() {
+  pkgdesc='An extended replacement for Comic Sans MS (TTF format)'
+  conflict=('otf-comic-neue')
 
   cd "${pkgbase}-${pkgver}"
-
-  case "${1}" in
-    ttf-comic-neue)
-      pkgdesc='Comic Neue is an extended replacement for the Comic Sans MS font'
-      cd TTF
-      fonts=(ComicNeue/*.ttf ComicNeue-Angular/*.ttf)
-      installdir=TTF;;
-    otf-comic-neue)
-      pkgdesc='Comic Neue is an extended replacement for the Comic Sans MS font'
-      cd OTF
-      fonts=(ComicNeue/*.otf ComicNeue-Angular/*.otf)
-      installdir=OTF;;
-  esac
-
-  install -dm755 "${pkgdir}/usr/share/fonts/${installdir}"
-
-  for font in "${fonts[@]}"; do
-    install -m644 "${font}" "${pkgdir}/usr/share/fonts/${installdir}"
-  done
-
-  install -D -m644 ../../fontconfig.conf \
+  install -Dm755 "${pkgdir}/usr/share/fonts/TTF"
+  install -m644 TTF/Comic{Neue,Neue-Angular}/*.ttf \
+    "${pkgdir}/usr/share/fonts/TTF"
+  install -Dm644 OFL.txt \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 ../fontconfig.conf \
     "${pkgdir}/usr/share/fontconfig/conf.avail/75-${pkgname}.conf"
+}
 
-  install -D -m644 ../OFL.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+package_otf-comic-neue() {
+  pkgdesc='An extended replacement for Comic Sans MS (OTF format)'
+  conflict='ttf-comic-neue'
 
+  cd "${pkgbase}-${pkgver}"
+  install -Dm755 "${pkgdir}/usr/share/fonts/OTF"
+  install -m644 OTF/Comic{Neue,Neue-Angular}/*.otf \
+    "${pkgdir}/usr/share/fonts/OTF"
+  install -Dm644 OFL.txt \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 ../fontconfig.conf \
+    "${pkgdir}/usr/share/fontconfig/conf.avail/75-${pkgname}.conf"
 }
-
-for _pkgname in ${pkgname[@]}; do
-  eval "function package_${_pkgname}() { _package ${_pkgname}; }"
-done