diff --git a/scripts/buildct.sh b/scripts/buildct.sh index 96e565c..f0575c5 100644 --- a/scripts/buildct.sh +++ b/scripts/buildct.sh @@ -58,6 +58,28 @@ check_china() { fi } +check_cdn() { + local o_url=$1 + for cdn_url in "${cdn_urls[@]}"; do + if curl -sL -k "$cdn_url$o_url" --max-time 6 | grep -q "success" >/dev/null 2>&1; then + export cdn_success_url="$cdn_url" + return + fi + sleep 0.5 + done + export cdn_success_url="" +} + +check_cdn_file() { + check_cdn "https://raw.githubusercontent.com/spiritLHLS/ecs/main/back/test" + if [ -n "$cdn_success_url" ]; then + _yellow "CDN available, using CDN" + else + _yellow "No CDN available, no use CDN" + fi +} + + get_system_arch check_china if [ -z "${system_arch}" ] || [ ! -v system_arch ]; then @@ -206,27 +228,6 @@ else fi fi -check_cdn() { - local o_url=$1 - for cdn_url in "${cdn_urls[@]}"; do - if curl -sL -k "$cdn_url$o_url" --max-time 6 | grep -q "success" >/dev/null 2>&1; then - export cdn_success_url="$cdn_url" - return - fi - sleep 0.5 - done - export cdn_success_url="" -} - -check_cdn_file() { - check_cdn "https://raw.githubusercontent.com/spiritLHLS/ecs/main/back/test" - if [ -n "$cdn_success_url" ]; then - _yellow "CDN available, using CDN" - else - _yellow "No CDN available, no use CDN" - fi -} - first_digit=${CTID:0:1} second_digit=${CTID:1:1} third_digit=${CTID:2:1} diff --git a/scripts/buildct_onlyv6.sh b/scripts/buildct_onlyv6.sh index 7343914..b40e69c 100644 --- a/scripts/buildct_onlyv6.sh +++ b/scripts/buildct_onlyv6.sh @@ -73,6 +73,27 @@ check_china() { fi } +check_cdn() { + local o_url=$1 + for cdn_url in "${cdn_urls[@]}"; do + if curl -sL -k "$cdn_url$o_url" --max-time 6 | grep -q "success" >/dev/null 2>&1; then + export cdn_success_url="$cdn_url" + return + fi + sleep 0.5 + done + export cdn_success_url="" +} + +check_cdn_file() { + check_cdn "https://raw.githubusercontent.com/spiritLHLS/ecs/main/back/test" + if [ -n "$cdn_success_url" ]; then + _yellow "CDN available, using CDN" + else + _yellow "No CDN available, no use CDN" + fi +} + get_system_arch check_china if [ -z "${system_arch}" ] || [ ! -v system_arch ]; then @@ -213,27 +234,6 @@ else fi fi -check_cdn() { - local o_url=$1 - for cdn_url in "${cdn_urls[@]}"; do - if curl -sL -k "$cdn_url$o_url" --max-time 6 | grep -q "success" >/dev/null 2>&1; then - export cdn_success_url="$cdn_url" - return - fi - sleep 0.5 - done - export cdn_success_url="" -} - -check_cdn_file() { - check_cdn "https://raw.githubusercontent.com/spiritLHLS/ecs/main/back/test" - if [ -n "$cdn_success_url" ]; then - _yellow "CDN available, using CDN" - else - _yellow "No CDN available, no use CDN" - fi -} - first_digit=${CTID:0:1} second_digit=${CTID:1:1} third_digit=${CTID:2:1}