diff --git a/bin/scripts/archive-font-patcher.sh b/bin/scripts/archive-font-patcher.sh index ca916c93e..e650c4986 100755 --- a/bin/scripts/archive-font-patcher.sh +++ b/bin/scripts/archive-font-patcher.sh @@ -18,7 +18,7 @@ touch "$outputdir/readme.md" mini_readme="$outputdir/readme.md" cat "$parent_dir/src/archive-font-patcher-readme.md" >> "$mini_readme" if [ $# -ge 1 ]; then - echo "Intemediate version, adding git version" + echo "Intermediate version, adding git version" echo -e "\n## Version\nThis archive is created from\n" >> "$mini_readme" git log --pretty=medium --no-decorate --no-abbrev -n 1 HEAD | sed 's/^/ /' >> "$mini_readme" fi diff --git a/bin/scripts/standardize-and-complete-readmes.sh b/bin/scripts/standardize-and-complete-readmes.sh index 2cf0a1761..6fd22ed77 100755 --- a/bin/scripts/standardize-and-complete-readmes.sh +++ b/bin/scripts/standardize-and-complete-readmes.sh @@ -38,6 +38,12 @@ function appendGeneralInfo { else downloadfrom="Direct links for [${fontname}.zip](https://github.com/ryanoasis/nerd-fonts/releases/latest/download/${fontname}.zip) or [${fontname}.tar.xz](https://github.com/ryanoasis/nerd-fonts/releases/latest/download/${fontname}.tar.xz)" fi + local iconinfo="${sd}/../../src/glyphs/README.md" + local iconinfostart=$(grep -Einm 1 '^#+ +icon' "${iconinfo}" | sed 's/:.*//') + { + printf "\n" + tail -n "+${iconinfostart}" "${iconinfo}" + } >> "${dest}" sed -e "s|%DOWNLOADFROM%|${downloadfrom}|" "${sd}/../../src/readme-per-directory-addendum.md" >> "${dest}" } diff --git a/src/archive-font-patcher-readme.md b/src/archive-font-patcher-readme.md index e7823332b..70930f0ab 100644 --- a/src/archive-font-patcher-readme.md +++ b/src/archive-font-patcher-readme.md @@ -1,7 +1,7 @@ # Nerd Fonts -This is font-patcher python script (and required source files) from a Nerd Fonts release. +This is the font-patcher python script (and required source files) from a Nerd Fonts release. ## Running @@ -13,3 +13,9 @@ This is font-patcher python script (and required source files) from a Nerd Fonts For more information see: * https://github.com/ryanoasis/nerd-fonts/ * https://github.com/ryanoasis/nerd-fonts/releases/latest/ + +## Licensing + +This script has an MIT license. + +The added icons' authors and licenses can be found in the `src/` subdirectory. diff --git a/src/glyphs/README.md b/src/glyphs/README.md index 48c1c2dde..709dc45d6 100644 --- a/src/glyphs/README.md +++ b/src/glyphs/README.md @@ -1,4 +1,4 @@ -### Contents +# Contents This directory contains all the glyphs (glyph sets) that the `font-patcher` puts into the fonts. @@ -9,19 +9,19 @@ Do not edit and commit changes to that font directly. ## Icon sets -| Icon set name | upstream | version | license | -|---|---|---|---| -| Codicons | https://github.com/microsoft/vscode-codicons | 0.0.35 | CC BY 4.0 | -| Devicons | https://github.com/devicons/devicon | 2.16.0 | MIT | -| extraglyphs | - (originally from font Hack ) | - | MIT | -| Font Awesome | https://github.com/FortAwesome/Font-Awesome | 6.5.1 | CC BY 4.0 | -| Font Awesome Extension | https://github.com/AndreLZGava/font-awesome-extension | 0.0.3 | MIT | -| Font Logos | https://github.com/lukas-w/font-logos | 1.3.0 | unlicensed | -| MaterialDesign| https://github.com/Templarian/MaterialDesign-Font | Oct 6, 2022 | Apache 2.0 | -| Octicons | https://github.com/primer/octicons | 18.3.0 | MIT | -| Seti and original | https://github.com/jesseweed/seti-ui | 0.8.1 | MIT | -| Pomicons | https://github.com/gabrielelana/pomicons | 1.001 | OFL 1.1 RFN | -| Powerline Extra | https://github.com/ryanoasis/powerline-extra-symbols | 1.200 | MIT | -| Powerline Symbols | https://github.com/powerline/powerline | 1.000 (ca 2013) | MIT | -| Power Symbols IEC | https://github.com/jloughry/Unicode | Feb 2015 | MIT | -| Weather Icons | https://github.com/erikflowers/weather-icons | 2.0.10 (1.100) | OFL 1.1 | +| Icon set name | upstream | version | license | +|------------------------|-------------------------------------------------------|-----------------|-------------| +| Codicons | https://github.com/microsoft/vscode-codicons | 0.0.35 | CC BY 4.0 | +| Devicons | https://github.com/devicons/devicon | 2.16.0 | MIT | +| extraglyphs | https://github.com/source-foundry/Hack | - | MIT | +| Font Awesome | https://github.com/FortAwesome/Font-Awesome | 6.5.1 | CC BY 4.0 | +| Font Awesome Extension | https://github.com/AndreLZGava/font-awesome-extension | 0.0.3 | MIT | +| Font Logos | https://github.com/lukas-w/font-logos | 1.3.0 | unlicensed | +| MaterialDesign | https://github.com/Templarian/MaterialDesign-Font | Oct 6, 2022 | Apache 2.0 | +| Octicons | https://github.com/primer/octicons | 18.3.0 | MIT | +| Seti and original | https://github.com/jesseweed/seti-ui | 0.8.1 | MIT | +| Pomicons | https://github.com/gabrielelana/pomicons | 1.001 | OFL 1.1 RFN | +| Powerline Extra | https://github.com/ryanoasis/powerline-extra-symbols | 1.200 | MIT | +| Powerline Symbols | https://github.com/powerline/powerline | 1.000 (ca 2013) | MIT | +| Power Symbols IEC | https://github.com/jloughry/Unicode | Feb 2015 | MIT | +| Weather Icons | https://github.com/erikflowers/weather-icons | 2.0.10 (1.100) | OFL 1.1 |