shuguang/reinstall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: 优化 test_url

Browse Source
This commit is contained in:
bin456789 2023-09-16 20:00:06 +08:00
parent 383f31ec26
commit baf928ab0f
No known key found for this signature in database
GPG Key ID: EE301B386DE6C11B
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
reinstall.sh
View File

@ -141,17 +141,29 @@ insert_into_file() {
} }
test_url() { test_url() {
url=$1 test_url_real false "$@"
expect_type=$2 }
var_to_eval=$3
test_url_grace() {
test_url_real true "$@"
}
test_url_real() {
grace=$1
url=$2
expect_type=$3
var_to_eval=$4
info test url info test url
echo $url echo $url
tmp_file=/tmp/reinstall-img-test failed() {
$grace && return 1
error_and_exit "$@"
}
if ! curl -r 0-1048575 -Lo $tmp_file $url; then tmp_file=/tmp/reinstall-img-test
error "$url not accessible" if ! curl -r 0-1048575 -Lo "$tmp_file" "$url"; then
return 1 failed "$url not accessible"
fi fi
if [ -n "$expect_type" ]; then if [ -n "$expect_type" ]; then
@ -166,8 +178,7 @@ test_url() {
[ -n "$var_to_eval" ] && eval $var_to_eval=$real_type [ -n "$var_to_eval" ] && eval $var_to_eval=$real_type
if ! grep -wo "$real_type" <<<"$expect_type"; then if ! grep -wo "$real_type" <<<"$expect_type"; then
error "$url expected: $expect_type. actual: $real_type." failed "$url expected: $expect_type. actual: $real_type."
return 1
fi fi
fi fi
} }
@ -470,7 +481,7 @@ setos() {
for cur_mirror in $(curl -L $mirrorlist | sed "/^#/d" | sed "s,\$basearch,$basearch,"); do for cur_mirror in $(curl -L $mirrorlist | sed "/^#/d" | sed "s,\$basearch,$basearch,"); do
host=$(get_host_by_url $cur_mirror) host=$(get_host_by_url $cur_mirror)
if is_host_has_ipv4_and_ipv6 $host && if is_host_has_ipv4_and_ipv6 $host &&
test_url ${cur_mirror}images/pxeboot/vmlinuz; then test_url_grace ${cur_mirror}images/pxeboot/vmlinuz; then
mirror=$cur_mirror mirror=$cur_mirror
break break
fi fi