From c2861581f222d664e272051c0d755a5d5aa8208e Mon Sep 17 00:00:00 2001 From: Fini Jastrow Date: Mon, 25 Mar 2024 23:23:24 +0100 Subject: [PATCH] IntelOneMono: Simplify unpatched directory [why] For new fonts we do not create one subdirectory for each font file anymore. The (historic) reason were the many variants that each font file had been patched with. Nowadays we just have 3 variants for each font file. And anyhow this font is release archive released only. [how] Simplify update script and move font files. Signed-off-by: Fini Jastrow --- bin/scripts/lib/fonts.json | 2 +- .../{Bold => }/IntelOneMono-Bold.ttf | Bin .../IntelOneMono-BoldItalic.ttf | Bin .../{Italic => }/IntelOneMono-Italic.ttf | Bin .../{Light => }/IntelOneMono-Light.ttf | Bin .../IntelOneMono-LightItalic.ttf | Bin .../{Medium => }/IntelOneMono-Medium.ttf | Bin .../IntelOneMono-MediumItalic.ttf | Bin .../{Regular => }/IntelOneMono-Regular.ttf | Bin src/unpatched-fonts/IntelOneMono/update.sh | 19 ++++++++---------- src/unpatched-fonts/fontfilenames | 2 +- 11 files changed, 10 insertions(+), 13 deletions(-) rename src/unpatched-fonts/IntelOneMono/{Bold => }/IntelOneMono-Bold.ttf (100%) rename src/unpatched-fonts/IntelOneMono/{Bold-Italic => }/IntelOneMono-BoldItalic.ttf (100%) rename src/unpatched-fonts/IntelOneMono/{Italic => }/IntelOneMono-Italic.ttf (100%) rename src/unpatched-fonts/IntelOneMono/{Light => }/IntelOneMono-Light.ttf (100%) rename src/unpatched-fonts/IntelOneMono/{Light-Italic => }/IntelOneMono-LightItalic.ttf (100%) rename src/unpatched-fonts/IntelOneMono/{Medium => }/IntelOneMono-Medium.ttf (100%) rename src/unpatched-fonts/IntelOneMono/{Medium-Italic => }/IntelOneMono-MediumItalic.ttf (100%) rename src/unpatched-fonts/IntelOneMono/{Regular => }/IntelOneMono-Regular.ttf (100%) diff --git a/bin/scripts/lib/fonts.json b/bin/scripts/lib/fonts.json index ffaff051a..eac118d04 100644 --- a/bin/scripts/lib/fonts.json +++ b/bin/scripts/lib/fonts.json @@ -449,7 +449,7 @@ "patchedName": "IntoneMono", "folderName": "IntelOneMono", "imagePreviewFont": "IntoneMono Nerd Font", - "imagePreviewFontSource": "IntelOneMono/Regular/IntelOneMono-Regular.ttf", + "imagePreviewFontSource": "IntelOneMono/IntelOneMono-Regular.ttf", "linkPreviewFont": "intel-one-mono", "caskName": "intone-mono", "repoRelease": false, diff --git a/src/unpatched-fonts/IntelOneMono/Bold/IntelOneMono-Bold.ttf b/src/unpatched-fonts/IntelOneMono/IntelOneMono-Bold.ttf similarity index 100% rename from src/unpatched-fonts/IntelOneMono/Bold/IntelOneMono-Bold.ttf rename to src/unpatched-fonts/IntelOneMono/IntelOneMono-Bold.ttf diff --git a/src/unpatched-fonts/IntelOneMono/Bold-Italic/IntelOneMono-BoldItalic.ttf b/src/unpatched-fonts/IntelOneMono/IntelOneMono-BoldItalic.ttf similarity index 100% rename from src/unpatched-fonts/IntelOneMono/Bold-Italic/IntelOneMono-BoldItalic.ttf rename to src/unpatched-fonts/IntelOneMono/IntelOneMono-BoldItalic.ttf diff --git a/src/unpatched-fonts/IntelOneMono/Italic/IntelOneMono-Italic.ttf b/src/unpatched-fonts/IntelOneMono/IntelOneMono-Italic.ttf similarity index 100% rename from src/unpatched-fonts/IntelOneMono/Italic/IntelOneMono-Italic.ttf rename to src/unpatched-fonts/IntelOneMono/IntelOneMono-Italic.ttf diff --git a/src/unpatched-fonts/IntelOneMono/Light/IntelOneMono-Light.ttf b/src/unpatched-fonts/IntelOneMono/IntelOneMono-Light.ttf similarity index 100% rename from src/unpatched-fonts/IntelOneMono/Light/IntelOneMono-Light.ttf rename to src/unpatched-fonts/IntelOneMono/IntelOneMono-Light.ttf diff --git a/src/unpatched-fonts/IntelOneMono/Light-Italic/IntelOneMono-LightItalic.ttf b/src/unpatched-fonts/IntelOneMono/IntelOneMono-LightItalic.ttf similarity index 100% rename from src/unpatched-fonts/IntelOneMono/Light-Italic/IntelOneMono-LightItalic.ttf rename to src/unpatched-fonts/IntelOneMono/IntelOneMono-LightItalic.ttf diff --git a/src/unpatched-fonts/IntelOneMono/Medium/IntelOneMono-Medium.ttf b/src/unpatched-fonts/IntelOneMono/IntelOneMono-Medium.ttf similarity index 100% rename from src/unpatched-fonts/IntelOneMono/Medium/IntelOneMono-Medium.ttf rename to src/unpatched-fonts/IntelOneMono/IntelOneMono-Medium.ttf diff --git a/src/unpatched-fonts/IntelOneMono/Medium-Italic/IntelOneMono-MediumItalic.ttf b/src/unpatched-fonts/IntelOneMono/IntelOneMono-MediumItalic.ttf similarity index 100% rename from src/unpatched-fonts/IntelOneMono/Medium-Italic/IntelOneMono-MediumItalic.ttf rename to src/unpatched-fonts/IntelOneMono/IntelOneMono-MediumItalic.ttf diff --git a/src/unpatched-fonts/IntelOneMono/Regular/IntelOneMono-Regular.ttf b/src/unpatched-fonts/IntelOneMono/IntelOneMono-Regular.ttf similarity index 100% rename from src/unpatched-fonts/IntelOneMono/Regular/IntelOneMono-Regular.ttf rename to src/unpatched-fonts/IntelOneMono/IntelOneMono-Regular.ttf diff --git a/src/unpatched-fonts/IntelOneMono/update.sh b/src/unpatched-fonts/IntelOneMono/update.sh index 9570f2564..b0c3d1770 100755 --- a/src/unpatched-fonts/IntelOneMono/update.sh +++ b/src/unpatched-fonts/IntelOneMono/update.sh @@ -40,17 +40,14 @@ unzip_file "$TEMP/iom.zip" "$TEMP" echo "Extracted to $TEMP" -echo "Creating directories" -mkdir -p ./Bold/ ./Bold-Italic/ ./Italic/ ./Light/ ./Light-Italic/ ./Medium/ ./Medium-Italic/ ./Regular/ - echo "Moving files" -mv "$TEMP/ttf/IntelOneMono-Bold.ttf" ./Bold -mv "$TEMP/ttf/IntelOneMono-BoldItalic.ttf" ./Bold-Italic -mv "$TEMP/ttf/IntelOneMono-Italic.ttf" ./Italic -mv "$TEMP/ttf/IntelOneMono-Light.ttf" ./Light -mv "$TEMP/ttf/IntelOneMono-LightItalic.ttf" ./Light-Italic -mv "$TEMP/ttf/IntelOneMono-Medium.ttf" ./Medium -mv "$TEMP/ttf/IntelOneMono-MediumItalic.ttf" ./Medium-Italic -mv "$TEMP/ttf/IntelOneMono-Regular.ttf" ./Regular +mv "$TEMP/ttf/IntelOneMono-Bold.ttf" . +mv "$TEMP/ttf/IntelOneMono-BoldItalic.ttf" . +mv "$TEMP/ttf/IntelOneMono-Italic.ttf" . +mv "$TEMP/ttf/IntelOneMono-Light.ttf" . +mv "$TEMP/ttf/IntelOneMono-LightItalic.ttf" . +mv "$TEMP/ttf/IntelOneMono-Medium.ttf" . +mv "$TEMP/ttf/IntelOneMono-MediumItalic.ttf" . +mv "$TEMP/ttf/IntelOneMono-Regular.ttf" . echo "Done. Make sure to patch the fonts now." diff --git a/src/unpatched-fonts/fontfilenames b/src/unpatched-fonts/fontfilenames index 7df6ce936..1fdfaf637 100644 --- a/src/unpatched-fonts/fontfilenames +++ b/src/unpatched-fonts/fontfilenames @@ -32,7 +32,7 @@ IBMPlexMono/Mono/IBMPlexMono-Regular.ttf Inconsolata/Inconsolata-Regular.ttf InconsolataGo/Regular/InconsolataGo-Regular.ttf InconsolataLGC/Regular/Inconsolata-LGC.ttf -IntelOneMono/Regular/IntelOneMono-Regular.ttf +IntelOneMono/IntelOneMono-Regular.ttf Iosevka/Regular/iosevka-regular.ttf IosevkaTerm/Regular/iosevka-term-regular.ttf IosevkaTermSlab/iosevka-term-slab-regular.ttf