otf-nerd-fonts-monacob-mono v2.3.3

1 files changed, 21 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6b64d53dfac7..b77673fa78e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: gbr <gbr@protonmail.com>
 # Contributor: Karmenzind
 pkgname=otf-nerd-fonts-monacob-mono
-pkgver=2.3.2
+pkgver=2.3.3
 pkgrel=1
 pkgdesc='MonacoB fonts patched with nerd-fonts'
 arch=('any')
@@ -10,33 +10,36 @@ license=('custom:Apple')
 depends=()
 makedepends=('fontforge' 'subversion')
 source=('COPYRIGHT'
-        'fix_font_name.py'
+        'monacob-font-patcher.py'
         'monaco-bold::git+https://github.com/vjpr/monaco-bold.git#commit=b77db4b6fc2e9df074f8db59cead862d7068e3d7'
-        "nerd-fonts-glyphs::svn+https://github.com/ryanoasis/nerd-fonts/tags/v$pkgver/src/glyphs"
-        "https://github.com/ryanoasis/nerd-fonts/raw/v$pkgver/font-patcher")
+        "nerd-fonts-glyphs::svn+https://github.com/ryanoasis/nerd-fonts/tags/v${pkgver}/src/glyphs"
+        "font-patcher-${pkgver}.py::https://github.com/ryanoasis/nerd-fonts/raw/v${pkgver}/font-patcher")
 sha256sums=('4a9d48f5368ca3b5699f61c505412a8d734a57c5da00ac0ac5ea70881f615ef3'
-            '45322eec525058c1bc55f2a999fad74eac9e9869caf7174bb292e92474d5aa73'
+            '153b3fcf2d418582d5293a50d8bf3e17f9f500db5633b7927a1921d4527b158d'
             'SKIP'
             'SKIP'
-            '3b733a8030c9c85fa369714eaeaddef766ed788717eb38334903c30f1523bd27')
+            'b8fba54cd34cd506a4f48b8780763c13f32b326a6cd37b74bcf33e5841b84cf8')
 
 prepare() {
-    find "$srcdir/monaco-bold/" -type f -name '*.otf' \
-        -exec ./fix_font_name.py {} \;
-    mkdir -p "$srcdir/src/"
-    ln -sf "$srcdir/nerd-fonts-glyphs/" "$srcdir/src/glyphs"
+    mkdir -p "${srcdir}/monaco-patched"
+    find "${srcdir}/monaco-bold" -type f -name '*.otf' |
+        xargs python3 "${srcdir}/monacob-font-patcher.py" \
+        --output-dir "${srcdir}/monaco-patched" 2> /dev/null
+
+    mkdir -p "${srcdir}/src"
+    ln -sf "${srcdir}/nerd-fonts-glyphs" "${srcdir}/src/glyphs"
 }
 
 build() {
-    mkdir -p "$srcdir/patched/"
-    find "$srcdir/monaco-bold/" -type f -name '*.otf' \
-        -exec fontforge -script "$srcdir/font-patcher" {} \
-        --mono --careful --complete --progressbars --outputdir "$srcdir/patched/" \;
+    mkdir -p "${srcdir}/nerd-patched"
+    find "${srcdir}/monaco-patched" -type f -name '*.otf' \
+        -exec fontforge -script "${srcdir}/font-patcher-${pkgver}.py" {} \
+        --mono --careful --complete --progressbars --outputdir "${srcdir}/nerd-patched" \;
 }
 
 package() {
-    install -d "$pkgdir/usr/share/licenses/$pkgname"
-    install -d "$pkgdir/usr/share/fonts/monacob/"
-    install -Dm644 "$srcdir/patched/"*.otf "$pkgdir/usr/share/fonts/monacob/"
-    install -Dm644 "$srcdir/COPYRIGHT" "$pkgdir/usr/share/licenses/$pkgname/"
+    install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -d "${pkgdir}/usr/share/fonts/monacob"
+    install -Dm644 "${srcdir}/nerd-patched/"*.otf "${pkgdir}/usr/share/fonts/monacob"
+    install -Dm644 "${srcdir}/COPYRIGHT" "${pkgdir}/usr/share/licenses/${pkgname}"
 }