particle-os/particle-os-modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(fonts): Avoid passing variable with empty string

Browse source
This commit is contained in:
fiftydinar 2024-04-02 17:14:06 +02:00 • committed by GitHub
commit 1c454dc931
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

53
modules/fonts/sources/google-fonts.sh
View file

@ -8,36 +8,35 @@ echo "Installation of google-fonts started"
rm -rf "${DEST}"
for FONT in "${FONTS[@]}"; do
FONT="${FONT#"${FONT%%[![:space:]]*}"}" # Trim leading whitespace
FONT="${FONT%"${FONT##*[![:space:]]}"}" # Trim trailing whitespace
mkdir -p "${DEST}/${FONT}"
if [ -n "$FONT" ]; then
FONT="${FONT#"${FONT%%[![:space:]]*}"}" # Trim leading whitespace
FONT="${FONT%"${FONT##*[![:space:]]}"}" # Trim trailing whitespace
mkdir -p "${DEST}/${FONT}"
readarray -t FILE_REFS < <(
if JSON=$(
curl -s "https://fonts.google.com/download/list?family=${FONT// /%20}" | # spaces are replaced with %20 for the URL
tail -n +2 # remove first line, which as of March 2024 contains ")]}'" and breaks JSON parsing
); then
if FILE_REFS=$(echo "$JSON" | jq -c '.manifest.fileRefs[]' 2>/dev/null); then
echo "$FILE_REFS"
fi
fi
)
if [ ${#FILE_REFS[@]} -eq 0 ]; then
echo "Could not find download information for ${FONT}"
else
for FILE_REF in "${FILE_REFS[@]}"; do
if FILENAME=$(echo "${FILE_REF}" | jq -er '.filename' 2>/dev/null); then
if URL=$(echo "${FILE_REF}" | jq -er '.url' 2>/dev/null); then
echo "Downloading ${FILENAME} from ${URL}"
curl "${URL}" -o "${DEST}/${FONT}/${FILENAME##*/}" # everything before the last / is removed to get the filename
else
echo "Failed to extract URLs for: ${FONT}" >&2
readarray -t "FILE_REFS" < <(
if output=$(curl -s "https://fonts.google.com/download/list?family=${FONT// /%20}" | tail -n +2); then
if FILE_REFS=$(echo "$output" | jq -c '.manifest.fileRefs[]' 2>/dev/null); then
echo "$FILE_REFS"
fi
else
echo "Failed to extract filenames for: ${FONT}" >&2
fi
done
)
if [ ${#FILE_REFS[@]} -eq 0 ]; then
echo "Could not find download information for ${FONT}"
else
for FILE_REF in "${FILE_REFS[@]}"; do
if FILENAME=$(echo "${FILE_REF}" | jq -er '.filename' 2>/dev/null); then
if URL=$(echo "${FILE_REF}" | jq -er '.url' 2>/dev/null); then
echo "Downloading ${FILENAME} from ${URL}"
curl "${URL}" -o "${DEST}/${FONT}/${FILENAME##*/}" # everything before the last / is removed to get the filename
else
echo "Failed to extract URLs for: ${FONT}" >&2
fi
else
echo "Failed to extract filenames for: ${FONT}" >&2
fi
done
fi
fi
done