upgpkg: nerd-fonts-complete 2.0.0-2

v2.0.0 rev. 2

3 files changed, 84 insertions, 85 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32253651ab43..c2676366ccaf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nerd-fonts-complete
-	pkgdesc = collection of over 20 patched fonts (complete variant) for powerline, devicons, and vim-devicons: includes Droid Sans, Meslo, AnonymousPro, ProFont, Inconsolta, and many more
+	pkgdesc = Iconic font aggregator, collection, and patcher. 40+ patched fonts, over 3,600 glyph/icons, includes popular collections such as Font Awesome & fonts such as Hack
 	pkgver = 2.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ryanoasis/nerd-fonts
 	install = nerd-fonts-complete.install
 	arch = any
@@ -10,12 +10,34 @@ pkgbase = nerd-fonts-complete
 	depends = xorg-font-utils
 	conflicts = nerd-fonts-git
 	conflicts = nerd-fonts-complete-mono-glyphs
-	source = nerd-fonts-complete-2.0.0.tar.gz::https://github.com/ryanoasis/nerd-fonts/archive/v2.0.0.tar.gz
-	source = https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.0.0/install.sh
-	source = arch-friendly-installer.patch
-	sha256sums = 0d5939042eff3b2d9b81ee2a871b3d2c046cbc6781f20ae87cdecfc1833e7bc8
-	sha256sums = 0e2cdb9d4c84e8b697f32c77f0b5cae2a2fa8ba93ae60ca852c06a34fc14395c
-	sha256sums = d7073412a8d8402c6f1278dc15432edeec56092d1e47fd435741eda66919e57d
+	source = https://gitlab.com/devopsdeluxe/nerd-fonts-aur/raw/v2.0.0/release/NerdFonts.tar.xz
+	source = https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.0.0/LICENSE
+	source = https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.0.0/bin/scripts/lib/i_all.sh
+	source = https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.0.0/bin/scripts/lib/i_dev.sh
+	source = https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.0.0/bin/scripts/lib/i_fa.sh
+	source = https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.0.0/bin/scripts/lib/i_fae.sh
+	source = https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.0.0/bin/scripts/lib/i_iec.sh
+	source = https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.0.0/bin/scripts/lib/i_linux.sh
+	source = https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.0.0/bin/scripts/lib/i_material.sh
+	source = https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.0.0/bin/scripts/lib/i_oct.sh
+	source = https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.0.0/bin/scripts/lib/i_ple.sh
+	source = https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.0.0/bin/scripts/lib/i_pom.sh
+	source = https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.0.0/bin/scripts/lib/i_seti.sh
+	source = https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.0.0/bin/scripts/lib/i_weather.sh
+	sha256sums = ef42a129f63f0166749e4bb1aaa878e31d18381be34a4404a32641e9551b53b1
+	sha256sums = d2a29823384e9194a87936ccad495c764c2ef733b29bfa6f72a1d65803ce02e5
+	sha256sums = 036361c808c84242b819ba24246f205b283ae51ba5d5d3304848f999a3ff0622
+	sha256sums = 254f32ceca71d36afee8ddbcd2c98a5de06ab7d7579f03e693987501bef6476b
+	sha256sums = f3d00c7188f9499911c8215483cb9b430fa1873f531fa57fd30ca20f0cad5314
+	sha256sums = 09cfd8e5748c6401ee2bae24b95eb1c98cb7f7a4200c6337b741084612091b1c
+	sha256sums = f0fe3eac3a979610153ca60611954cf4baba133e1268f395e2f61a8b800d26dd
+	sha256sums = 3406824f07f7b92757d88356f9f3d89e2270eae0f2862205e7ed1eb8bd294eaf
+	sha256sums = cddb161c6b4a3ec5f4e4d1723ebc9ce0bea6da572bbb940999a05eaf9ad52d74
+	sha256sums = 67ab5c4bb0d4d057c4d6cd34075a8643f6f845977a2c57d56f05ac931b2f54f0
+	sha256sums = d94a7c8ede808826258ed651f040bf4d3904fbf81c722692359b5ca5f30d6135
+	sha256sums = 50be7ad9d955a05ba56badabde7992cf5277cc2ccb2348af3293a517bfaefe9d
+	sha256sums = 3245d4859e7c4fe311e79599a406af84564c079d0ba5f36d3a458ee646ca5aac
+	sha256sums = ced3b935d4f4a04e98da215862de6b6ab4282669fd20ff0b039c913b2f322dec
 
 pkgname = nerd-fonts-complete
 
diff --git a/PKGBUILD b/PKGBUILD
index 9496e2f7e29c..52a1f2c3d8f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,13 @@
 # Maintainer: Super Bo <supernbo at gmail dot com>
 # Maintainer: glider <samtron1412 {at} gmail {dot} com>
+
 pkgname='nerd-fonts-complete'
 pkgver=2.0.0
-pkgrel=1
-pkgdesc="collection of over 20 patched fonts (complete variant) for \
-         powerline, devicons, and vim-devicons: includes Droid Sans, \
-         Meslo, AnonymousPro, ProFont, Inconsolta, and many more"
+pkgrel=2
+pkgdesc='
+Iconic font aggregator, collection, and patcher. 40+ patched fonts, over 3,600
+glyph/icons, includes popular collections such as Font Awesome & fonts such as
+Hack'
 arch=('any')
 url='https://github.com/ryanoasis/nerd-fonts'
 license=('MIT')
@@ -13,41 +15,64 @@ depends=('fontconfig' 'xorg-font-utils')
 conflicts=('nerd-fonts-git' 'nerd-fonts-complete-mono-glyphs')
 install="${pkgname}.install"
 source=(
-  "${pkgname}-${pkgver}.tar.gz::https://github.com/ryanoasis/nerd-fonts/archive/v${pkgver}.tar.gz"
-  'https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v2.0.0/install.sh'
-  'arch-friendly-installer.patch'
+  "https://gitlab.com/devopsdeluxe/nerd-fonts-aur/raw/v${pkgver}/release/NerdFonts.tar.xz"
+  "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v${pkgver}/LICENSE"
+  "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v${pkgver}/bin/scripts/lib/i_all.sh"
+  "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v${pkgver}/bin/scripts/lib/i_dev.sh"
+  "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v${pkgver}/bin/scripts/lib/i_fa.sh"
+  "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v${pkgver}/bin/scripts/lib/i_fae.sh"
+  "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v${pkgver}/bin/scripts/lib/i_iec.sh"
+  "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v${pkgver}/bin/scripts/lib/i_linux.sh"
+  "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v${pkgver}/bin/scripts/lib/i_material.sh"
+  "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v${pkgver}/bin/scripts/lib/i_oct.sh"
+  "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v${pkgver}/bin/scripts/lib/i_ple.sh"
+  "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v${pkgver}/bin/scripts/lib/i_pom.sh"
+  "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v${pkgver}/bin/scripts/lib/i_seti.sh"
+  "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v${pkgver}/bin/scripts/lib/i_weather.sh"
 )
 sha256sums=(
-  '0d5939042eff3b2d9b81ee2a871b3d2c046cbc6781f20ae87cdecfc1833e7bc8'
-  '0e2cdb9d4c84e8b697f32c77f0b5cae2a2fa8ba93ae60ca852c06a34fc14395c'
-  'd7073412a8d8402c6f1278dc15432edeec56092d1e47fd435741eda66919e57d'
+  'ef42a129f63f0166749e4bb1aaa878e31d18381be34a4404a32641e9551b53b1'
+  'd2a29823384e9194a87936ccad495c764c2ef733b29bfa6f72a1d65803ce02e5'
+  '036361c808c84242b819ba24246f205b283ae51ba5d5d3304848f999a3ff0622'
+  '254f32ceca71d36afee8ddbcd2c98a5de06ab7d7579f03e693987501bef6476b'
+  'f3d00c7188f9499911c8215483cb9b430fa1873f531fa57fd30ca20f0cad5314'
+  '09cfd8e5748c6401ee2bae24b95eb1c98cb7f7a4200c6337b741084612091b1c'
+  'f0fe3eac3a979610153ca60611954cf4baba133e1268f395e2f61a8b800d26dd'
+  '3406824f07f7b92757d88356f9f3d89e2270eae0f2862205e7ed1eb8bd294eaf'
+  'cddb161c6b4a3ec5f4e4d1723ebc9ce0bea6da572bbb940999a05eaf9ad52d74'
+  '67ab5c4bb0d4d057c4d6cd34075a8643f6f845977a2c57d56f05ac931b2f54f0'
+  'd94a7c8ede808826258ed651f040bf4d3904fbf81c722692359b5ca5f30d6135'
+  '50be7ad9d955a05ba56badabde7992cf5277cc2ccb2348af3293a517bfaefe9d'
+  '3245d4859e7c4fe311e79599a406af84564c079d0ba5f36d3a458ee646ca5aac'
+  'ced3b935d4f4a04e98da215862de6b6ab4282669fd20ff0b039c913b2f322dec'
 )
 
 package() {
-  cd "${pkgname/-complete}-${pkgver}"
-
-  cp ../install.sh .
-  patch install.sh < ../arch-friendly-installer.patch
-  export pkgdir
+  local -r bindir="${pkgdir}/usr/bin"
+  local -r licensedir="${pkgdir}/usr/share/licenses/${pkgname}"
+  local -r otfdir="${pkgdir}/usr/share/fonts/${pkgname}/otf"
+  local -r ttfdir="${pkgdir}/usr/share/fonts/${pkgname}/ttf"
 
   # otf:
-  ./install.sh --clean --install-to-system-path --quiet --otf
-  install -d -m 755 "${pkgdir}/usr/share/fonts/NerdFonts/otf"
-  for otf in "${pkgdir}/usr/share/fonts/NerdFonts/"*.otf; do
-    install -m 644 "${otf}" "${pkgdir}/usr/share/fonts/NerdFonts/otf"
-  done
+  install -d -m 755 "${otfdir}"
+  while read -r font; do
+    install -m 644 "${font}" "${otfdir}"
+  done < <(find NerdFonts -name "*.otf")
 
   # ttf:
-  ./install.sh --install-to-system-path --quiet --ttf
-  install -d -m 755 "${pkgdir}/usr/share/fonts/NerdFonts/ttf"
-  for ttf in "${pkgdir}/usr/share/fonts/NerdFonts/"*.ttf; do
-    install -m 644 "${ttf}" "${pkgdir}/usr/share/fonts/NerdFonts/ttf"
-  done
+  install -d -m 755 "${ttfdir}"
+  while read -r font; do
+    install -m 644 "${font}" "${ttfdir}"
+  done < <(find NerdFonts -name "*.ttf")
+
+  # Scripts:
+  install -d -m 755 "${bindir}"
+  while read -r script; do
+    install -m 755 "${script}" "${bindir}"
+  done < <(find "${srcdir}" -maxdepth 1 -name "i_*.sh")
 
-  # Cleanup:
-  rm "${pkgdir}/usr/share/fonts/NerdFonts/"*.otf
-  rm "${pkgdir}/usr/share/fonts/NerdFonts/"*.ttf
-  mv "${pkgdir}/usr/share/fonts/NerdFonts" "${pkgdir}/usr/share/fonts/${pkgname}"
+  install -d -m 755 "${licensedir}"
+  install -m 644 LICENSE "${licensedir}"
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/arch-friendly-installer.patch b/arch-friendly-installer.patch
deleted file mode 100644
index 4a73a9617970..000000000000
--- a/arch-friendly-installer.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-@@ -246,7 +246,7 @@
- else
-   # Linux
-   if [[ "system" == "$installpath" ]]; then
--    font_dir="/usr/local/share/fonts"
-+    font_dir="${pkgdir}/usr/share/fonts"
-   else
-     font_dir="$HOME/.local/share/fonts"
-   fi
-@@ -275,8 +275,17 @@
-     [ "$quiet" = true ] && mkdir -p "$font_dir"
-     case $mode in
-       copy)
--        [ "$quiet" = false ] && cp -fv "${files[@]}" "$font_dir"
--        [ "$quiet" = true ] && cp -f "${files[@]}" "$font_dir"
-+        for font in "${files[@]}"; do
-+          if [[ -f "${font_dir}/${font}" ]]; then
-+            continue
-+          else
-+            if [[ "${quiet}" == true ]]; then
-+              cp "${font}" "${font_dir}"
-+            else
-+              cp "${font}" "${font_dir}"
-+            fi
-+          fi
-+        done
-         ;;
-       link)
-         [ "$quiet" = false ] && ln -sfv "${files[@]}" "$font_dir"
-@@ -285,18 +294,3 @@
-     esac;;
-
- esac
--
--# Reset font cache on Linux
--if [[ -n $(which fc-cache) ]]; then
--  [ "$quiet" = false ] && fc-cache -vf "$font_dir"
--  [ "$quiet" = true ] && fc-cache -f "$font_dir"
--  case $? in
--    [0-1])
--      # Catch fc-cache returning 1 on a success
--      exit 0
--      ;;
--    *)
--      exit $?
--      ;;
--  esac
--fi