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

Merge pull request #15596 from MikeMcQuaid/fix_update_messaging

Browse Source 
cmd/update.sh: always move `names*.txt` files.
This commit is contained in:
Bo Anderson 2023-06-27 17:53:15 +01:00 committed by GitHub
commit c5cbe6406b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
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,17 +814,20 @@ EOS
curl_exit_code=$? curl_exit_code=$?
[[ ${curl_exit_code} -eq 0 ]] && break [[ ${curl_exit_code} -eq 0 ]] && break
done done
if [[ -f "${HOMEBREW_CACHE}/api/${formula_or_cask}_names.txt" ]]
then
mv -f "${HOMEBREW_CACHE}/api/${formula_or_cask}_names.txt" \
"${HOMEBREW_CACHE}/api/${formula_or_cask}_names.before.txt"
fi
if [[ ${curl_exit_code} -eq 0 ]] if [[ ${curl_exit_code} -eq 0 ]]
then then
touch "${HOMEBREW_CACHE}/api/${formula_or_cask}.jws.json" touch "${HOMEBREW_CACHE}/api/${formula_or_cask}.jws.json"
CURRENT_JSON_BYTESIZE="$(wc -c "${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}" ]] if [[ "${INITIAL_JSON_BYTESIZE}" != "${CURRENT_JSON_BYTESIZE}" ]]
then then
if [[ -f "${HOMEBREW_CACHE}/api/${formula_or_cask}_names.txt" ]]
then
mv -f "${HOMEBREW_CACHE}/api/${formula_or_cask}_names.txt" \
"${HOMEBREW_CACHE}/api/${formula_or_cask}_names.before.txt"
fi
if [[ "${formula_or_cask}" == "formula" ]] if [[ "${formula_or_cask}" == "formula" ]]
then then