RomanNum3ral
/
quickemu
mirror of https://github.com/quickemu-project/quickemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: make use of _show_url_result()

This commit is contained in:
Martin Wimpress 2024-04-28 14:31:15 +01:00 committed by Martin Wimpress
parent 491d071fde
commit a5c2e0dd6b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
quickget
View File

@ -440,13 +440,13 @@ function list_url_all() {
for EDITION in $(editions_"${OS}"); do for EDITION in $(editions_"${OS}"); do
validate_release releases_"${OS}" validate_release releases_"${OS}"
URL=$(get_"${OS}" | cut_1 | head -1) URL=$(get_"${OS}" | cut_1 | head -1)
echo "${URL}" show_url_result "${OS}" "${RELEASE}" "${EDITION}" "${URL}"
done done
elif [[ "${OS}" == "windows"* ]]; then elif [[ "${OS}" == "windows"* ]]; then
"languages_${OS}" "languages_${OS}"
for LANG in "${LANGS[@]}"; do for LANG in "${LANGS[@]}"; do
validate_release releases_"${OS}" validate_release releases_"${OS}"
show_test_result SKIP "${OS}" "${RELEASE}" "${LANG}" "${URL}" show_url_result "${OS}" "${RELEASE}" "${LANG}" "SKIP"
done done
elif [[ "${OS}" == "macos" ]]; then elif [[ "${OS}" == "macos" ]]; then
validate_release releases_macos validate_release releases_macos
@ -460,7 +460,7 @@ function list_url_all() {
else else
validate_release releases_"${OS}" validate_release releases_"${OS}"
URL=$(get_"${OS}" | cut_1 | head -1) URL=$(get_"${OS}" | cut_1 | head -1)
echo "${URL}" show_url_result "${OS}" "${RELEASE}" "${EDITION}" "${URL}"
fi fi
done done
exit 0 exit 0
@ -1254,7 +1254,7 @@ function web_get() {
# Test mode for ISO # Test mode for ISO
if [ "${just}" == 'show' ]; then if [ "${just}" == 'show' ]; then
echo "${URL}" show_url_result "${OS}" "${RELEASE}" "${EDITION}" "${URL}"
exit 0 exit 0
elif [ "${just}" == 'test' ]; then elif [ "${just}" == 'test' ]; then
CHECK=$(web_check "${URL}" && echo 'PASS' || echo 'FAIL') CHECK=$(web_check "${URL}" && echo 'PASS' || echo 'FAIL')
@ -2094,7 +2094,7 @@ function get_macos() {
local chunkListSession=$(echo "$info" | grep 'expires' | grep 'chunklist') local chunkListSession=$(echo "$info" | grep 'expires' | grep 'chunklist')
if [ "${just}" == 'show' ]; then if [ "${just}" == 'show' ]; then
echo -e "Recovery URL (inaccessible through normal browser):\n${downloadLink}\nChunklist (used for verifying the Recovery Image):\n${chunkListLink}\nFirmware URLs:\n${OpenCore_qcow2}\n${OVMF_CODE}\n${OVMF_VARS}" show_url_result "${OS}" "${RELEASE}" "" "${downloadLink}"
exit 0 exit 0
elif [ "${just}" == 'test' ]; then elif [ "${just}" == 'test' ]; then
local CHECK=$(web_check "${downloadLink}" --header "Host: oscdn.apple.com" --header "Connection: close" --header "User-Agent: InternetRecovery/1.0" --header "Cookie: AssetToken=${downloadSession}" && echo 'PASS' || echo 'FAIL') local CHECK=$(web_check "${downloadLink}" --header "Host: oscdn.apple.com" --header "Connection: close" --header "User-Agent: InternetRecovery/1.0" --header "Cookie: AssetToken=${downloadSession}" && echo 'PASS' || echo 'FAIL')