changed the way the source and pkgbuild worked should be smaller builds now

1 files changed, 14 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e691352afb47..079b7b80f9d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: bohoomil <@zoho.com>
 # Maintainer: Solomon Choina <shlomochoina@gmail.com>
 pkgbase=ttf-alegreya-fonts-ibx
+_font=Alegreya
 pkgname=('ttf-alegreya-ibx' 'ttf-alegreya-sans-ibx')
 pkgver=2.008
-pkgrel=7
+pkgrel=1
 depends=('fontconfig')
 pkgdesc="Alegreya and Alegreya Sans are modern font families designed by Juan Pablo del Peral."
 url="http://www.huertatipografica.com/"
@@ -12,16 +13,14 @@ groups=('infinality-bundle-fonts-extra')
 license=('custom:OFL')
 # http://www.huertatipografica.com/free_download/24
 # http://www.google.com/fonts
-source=("alegreya-sans-ht-full-pack-ttf.zip::http://www.huertatipografica.com/free_download/24"
-        "alegreya-ht-full-pack.ttf.zip::https://www.huertatipografica.com/free_download/133"
-        http://www.1001freefonts.com/d/5540/alegreya_sc.zip
+source=("$_font-sans-$pkgver.tar.gz::https://github.com/huertatipografica/"$_font"-Sans/archive/v"$pkgver".tar.gz"
+        "$_font-$pkgver.tar.gz::https://github.com/huertatipografica/"$_font"/archive/v"$pkgver".tar.gz"
         45-alegreya.conf
         45-alegreya-sans.conf
         90-tt-alegreya.conf
         90-tt-alegreya-sans.conf)
-sha1sums=('0726934b64d477b12526273009a910b8862716ac'
-          '7f6186230283b0acc9c2123b046ff7cf9bb49fcf'
-          '07634393ffd242ac79af11b7fac0b3f26a865919'
+sha1sums=('4ea9bb61264846dbeec7a438a2ec7c6f87980507'
+          '08eb5b0634cf6228544c3f4b2bb71b68809c026d'
           'db08107ef08332b400ba3fcc5eb78fe0cd8ebebe'
           '8454c43dce5f6df1ed2bc7fa8c1a1aa8223766a5'
           'a6edf94a16a1768b3f6bb4e3bf87987b4ee833ab'
@@ -31,21 +30,19 @@ package_ttf-alegreya-ibx(){
   pkgdesc="Alegreya is a serif typeface originally intended for literature. TrueType version."
   conflicts=('otf-alegreya-ibx')
 
-  cd "${srcdir}"
+  cd "$srcdir"/"$_font"-"$pkgver"/
 
   install -m755 -d "${pkgdir}"/usr/share/licenses/"${pkgname}"
   install -m644 OFL.txt "${pkgdir}"/usr/share/licenses/"${pkgname}"
 
   install -m755 -d "${pkgdir}"/usr/share/fonts/"${pkgname}"
-  install -Dm644 *.ttf "${pkgdir}"/usr/share/fonts/"${pkgname}"
-
-  install -Dm644 *.ttf "${pkgdir}"/usr/share/fonts/"${pkgname}"
+  install -Dm644 fonts/ttf/*.ttf "${pkgdir}"/usr/share/fonts/"${pkgname}"
 
   install -m755 -d "${pkgdir}"/etc/fonts/conf.avail
   install -m755 -d "${pkgdir}"/etc/fonts/conf.d
-  install -m644 45-alegreya.conf \
+  install -m644 ../45-alegreya.conf \
     "${pkgdir}"/etc/fonts/conf.avail/45-alegreya.conf
-  install -m644 90-tt-alegreya.conf \
+  install -m644 ../90-tt-alegreya.conf \
     "${pkgdir}"/etc/fonts/conf.avail/90-tt-alegreya.conf
 
   cd "${pkgdir}"/etc/fonts/conf.d
@@ -57,21 +54,19 @@ package_ttf-alegreya-sans-ibx(){
   pkgdesc="Alegreya Sans is a humanist sans serif family with a calligraphic feeling that conveys a dynamic and varied rhythm. TrueType version."
   conflicts=('otf-alegreya-sans-ibx')
 
-  cd "${srcdir}"
+  cd "$srcdir"/"$_font"-Sans-"$pkgver"
 
   install -m755 -d "${pkgdir}"/usr/share/licenses/"${pkgname}"
   install -m644 OFL.txt "${pkgdir}"/usr/share/licenses/"${pkgname}"
 
   install -m755 -d "${pkgdir}"/usr/share/fonts/"${pkgname}"
-  install -Dm644 *.ttf "${pkgdir}"/usr/share/fonts/"${pkgname}"
-
-  install -Dm644 *.ttf "${pkgdir}"/usr/share/fonts/"${pkgname}"
+  install -Dm644 fonts/ttf/*.ttf "${pkgdir}"/usr/share/fonts/"${pkgname}"
 
   install -m755 -d "${pkgdir}"/etc/fonts/conf.avail
   install -m755 -d "${pkgdir}"/etc/fonts/conf.d
-  install -m644 45-alegreya-sans.conf \
+  install -m644 ../45-alegreya-sans.conf \
     "${pkgdir}"/etc/fonts/conf.avail/45-alegreya-sans.conf
-  install -m644 90-tt-alegreya-sans.conf \
+  install -m644 ../90-tt-alegreya-sans.conf \
     "${pkgdir}"/etc/fonts/conf.avail/90-tt-alegreya-sans.conf
 
   cd "${pkgdir}"/etc/fonts/conf.d