admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

cmd/update.sh: always move names*.txt files.

Browse Source 
Move the `names*.txt` files even when the file size hasn't changed
(which can happen when the versions change in the API but the file
size doesn't change).

Fixes #15217

While we're here, also add some whitespace for easier reading.
This commit is contained in:
Mike McQuaid 2023-06-27 13:12:12 +01:00
parent eff45ef570
commit 20dfa3694b
No known key found for this signature in database
GPG Key ID: 3338A31AFDB1D829
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Library/Homebrew/cmd/update.sh
View File

@ -788,11 +788,13 @@ EOS
then then
INITIAL_JSON_BYTESIZE="$(wc -c "${HOMEBREW_CACHE}"/api/"${formula_or_cask}".jws.json)" INITIAL_JSON_BYTESIZE="$(wc -c "${HOMEBREW_CACHE}"/api/"${formula_or_cask}".jws.json)"
fi fi
JSON_URLS=() JSON_URLS=()
if [[ -n "${HOMEBREW_API_DOMAIN}" && "${HOMEBREW_API_DOMAIN}" != "${HOMEBREW_API_DEFAULT_DOMAIN}" ]] if [[ -n "${HOMEBREW_API_DOMAIN}" && "${HOMEBREW_API_DOMAIN}" != "${HOMEBREW_API_DEFAULT_DOMAIN}" ]]
then then
JSON_URLS=("${HOMEBREW_API_DOMAIN}/${formula_or_cask}.jws.json") JSON_URLS=("${HOMEBREW_API_DOMAIN}/${formula_or_cask}.jws.json")
fi fi
JSON_URLS+=("${HOMEBREW_API_DEFAULT_DOMAIN}/${formula_or_cask}.jws.json") JSON_URLS+=("${HOMEBREW_API_DEFAULT_DOMAIN}/${formula_or_cask}.jws.json")
for json_url in "${JSON_URLS[@]}" for json_url in "${JSON_URLS[@]}"
do do
@ -812,18 +814,21 @@ EOS
curl_exit_code=$? curl_exit_code=$?
[[ ${curl_exit_code} -eq 0 ]] && break [[ ${curl_exit_code} -eq 0 ]] && break
done done
if [[ ${curl_exit_code} -eq 0 ]]
then
touch "${HOMEBREW_CACHE}/api/${formula_or_cask}.jws.json"
CURRENT_JSON_BYTESIZE="$(wc -c "${HOMEBREW_CACHE}"/api/"${formula_or_cask}".jws.json)"
if [[ "${INITIAL_JSON_BYTESIZE}" != "${CURRENT_JSON_BYTESIZE}" ]]
then
if [[ -f "${HOMEBREW_CACHE}/api/${formula_or_cask}_names.txt" ]] if [[ -f "${HOMEBREW_CACHE}/api/${formula_or_cask}_names.txt" ]]
then then
mv -f "${HOMEBREW_CACHE}/api/${formula_or_cask}_names.txt" \ mv -f "${HOMEBREW_CACHE}/api/${formula_or_cask}_names.txt" \
"${HOMEBREW_CACHE}/api/${formula_or_cask}_names.before.txt" "${HOMEBREW_CACHE}/api/${formula_or_cask}_names.before.txt"
fi fi
if [[ ${curl_exit_code} -eq 0 ]]
then
touch "${HOMEBREW_CACHE}/api/${formula_or_cask}.jws.json"
CURRENT_JSON_BYTESIZE="$(wc -c "${HOMEBREW_CACHE}"/api/"${formula_or_cask}".jws.json)"
if [[ "${INITIAL_JSON_BYTESIZE}" != "${CURRENT_JSON_BYTESIZE}" ]]
then
if [[ "${formula_or_cask}" == "formula" ]] if [[ "${formula_or_cask}" == "formula" ]]
then then
rm -f "${HOMEBREW_CACHE}/api/formula_aliases.txt" rm -f "${HOMEBREW_CACHE}/api/formula_aliases.txt"