1
0
mirror of https://github.com/ryanoasis/nerd-fonts.git synced 2024-12-25 20:18:01 +02:00

archive-fonts: Fix missing readme in archive

[why]
When run on more than one font the mini-readme is only added to the
first created archive.

[how]
Remove the readme file only after all archives have been generated.

[note]
Also rewrite `find` command, to actually do some work. The formulation
was rather odd, using a shell glob to find the directories and `find` to
select one.

Signed-off-by: Fini Jastrow <ulf.fini.jastrow@desy.de>
This commit is contained in:
Fini Jastrow 2022-08-25 08:04:14 +02:00
parent bc87b361a2
commit e7722458fc
2 changed files with 6 additions and 6 deletions

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Nerd Fonts Version: 2.1.0 # Nerd Fonts Version: 2.1.0
# Script Version: 1.1.1 # Script Version: 1.1.2
# Iterates over all patched fonts directories # Iterates over all patched fonts directories
# to generate ruby cask files for homebrew-fonts (https://github.com/caskroom/homebrew-fonts) # to generate ruby cask files for homebrew-fonts (https://github.com/caskroom/homebrew-fonts)
# adds Windows versions of the fonts as well (casks files just won't download them) # adds Windows versions of the fonts as well (casks files just won't download them)
@ -48,7 +48,7 @@ find "${outputdir:?}" -name "$search_pattern" -type f -delete
#find ./ProFont -maxdepth 0 -type d | # uncomment to test 1 font #find ./ProFont -maxdepth 0 -type d | # uncomment to test 1 font
# find ./IBMPlexMono -maxdepth 0 -type d | # uncomment to test 1 font # find ./IBMPlexMono -maxdepth 0 -type d | # uncomment to test 1 font
# uncomment to test all fonts: # uncomment to test all fonts:
find -- * -maxdepth 0 -iregex "$pattern" -type d | find . -maxdepth 1 -iregex "\./$pattern" -type d |
while read -r filename while read -r filename
do do
@ -71,14 +71,14 @@ do
# we can copy the font files without full paths but not necessarily the license files: # we can copy the font files without full paths but not necessarily the license files:
# add license files separately: # add license files separately:
# zip -9 "$outputdir/$basename" -rj "$searchdir" -i '*license*' -i '*LICENSE*' # zip -9 "$outputdir/$basename" -rj "$searchdir" -i '*license*' -i '*LICENSE*'
# work around to copy duplicate license files (only the last duplicate found) # work around to copy duplicate license files (only the last duplicate found)
# so we don't have to copy entire paths and can still use the junk option (-j) # so we don't have to copy entire paths and can still use the junk option (-j)
find "$searchdir" -type f -iname "*license*" | awk -F/ '{a[$NF]=$0}END{for(i in a)print a[i]}' | zip -9 -j "$outputdir/$basename" -@ find "$searchdir" -type f -iname "*license*" | awk -F/ '{a[$NF]=$0}END{for(i in a)print a[i]}' | zip -9 -j "$outputdir/$basename" -@
fi; fi;
# add mini readme file # add mini readme file
zip -9 "$outputdir/$basename" -rj "$mini_readme" -q zip -9 "$outputdir/$basename" -rj "$mini_readme" -q
rm -f "$mini_readme"
done done
rm -f "$mini_readme"
ls -al "$outputdir" ls -al "$outputdir"

View File

@ -82,7 +82,7 @@ function write_footer {
#find ./Hack -maxdepth 0 -type d | # uncomment to test 1 font #find ./Hack -maxdepth 0 -type d | # uncomment to test 1 font
#find ./ProFont -maxdepth 2 -type d | # uncomment to test 1 font #find ./ProFont -maxdepth 2 -type d | # uncomment to test 1 font
find . -maxdepth 1 -mindepth 1 -type d | # uncomment to test 1 font find . -maxdepth 1 -mindepth 1 -type d -iregex "./$1" |
while read -r filename while read -r filename
do do