xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

V6.7 调整下载超时时长

This commit is contained in:
Hyy2001X 2021-11-07 09:40:51 +08:00
parent f458ca4806
commit 90d4c99e61
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Scripts/AutoUpdate.sh
View File

@ -3,7 +3,7 @@
# AutoUpdate for Openwrt # AutoUpdate for Openwrt
# Dependences: bash wget-ssl/wget/uclient-fetch curl openssl jsonfilter # Dependences: bash wget-ssl/wget/uclient-fetch curl openssl jsonfilter
Version=V6.6.9 Version=V6.7
function TITLE() { function TITLE() {
clear && echo "Openwrt-AutoUpdate Script by Hyy2001 ${Version}" clear && echo "Openwrt-AutoUpdate Script by Hyy2001 ${Version}"
@ -348,7 +348,7 @@ function ANALYZE_API() {
local url name date size version count sha256 local url name date size version count sha256
local API_Cache=${Tmp_Path}/API_Cache local API_Cache=${Tmp_Path}/API_Cache
[[ $(CHECK_TIME ${API_File} 1) == false ]] && { [[ $(CHECK_TIME ${API_File} 1) == false ]] && {
DOWNLOADER --path ${Tmp_Path} --file-name API_Cache --dl ${DOWNLOADERS} --url "$(URL_X ${Github_Release}/API G@@1 F@@1) ${Github_API}@@1 " --no-url-name --timeout 3 --type 固件信息 --quiet DOWNLOADER --path ${Tmp_Path} --file-name API_Cache --dl ${DOWNLOADERS} --url "$(URL_X ${Github_Release}/API G@@1 F@@1) ${Github_API}@@1 " --no-url-name --timeout 5 --type 固件信息 --quiet
[[ ! $? == 0 || -z $(cat ${API_Cache} 2> /dev/null) ]] && { [[ ! $? == 0 || -z $(cat ${API_Cache} 2> /dev/null) ]] && {
ECHO r "Github API 请求错误,请检查网络后重试!" ECHO r "Github API 请求错误,请检查网络后重试!"
EXIT 2 EXIT 2
@ -403,7 +403,7 @@ function GET_CLOUD_LOG() {
;; ;;
esac esac
[[ $(CHECK_TIME ${Tmp_Path}/Update_Logs.json 1) == false ]] && { [[ $(CHECK_TIME ${Tmp_Path}/Update_Logs.json 1) == false ]] && {
DOWNLOADER --path ${Tmp_Path} --file-name Update_Logs.json --dl ${DOWNLOADERS} --url "$(URL_X ${Github_Release} G@@1)" --timeout 3 --type 固件更新日志 --quiet DOWNLOADER --path ${Tmp_Path} --file-name Update_Logs.json --dl ${DOWNLOADERS} --url "$(URL_X ${Github_Release} G@@1)" --timeout 5 --type 固件更新日志 --quiet
} }
[[ -s ${Tmp_Path}/Update_Logs.json ]] && { [[ -s ${Tmp_Path}/Update_Logs.json ]] && {
Result=$(jsonfilter -i ${Tmp_Path}/Update_Logs.json -e '@["'""${TARGET_PROFILE}""'"]["'""${Version}""'"]' 2> /dev/null) Result=$(jsonfilter -i ${Tmp_Path}/Update_Logs.json -e '@["'""${TARGET_PROFILE}""'"]["'""${Version}""'"]' 2> /dev/null)
@ -759,20 +759,20 @@ function DOWNLOADER() {
done done
case "${DL_Downloader}" in case "${DL_Downloader}" in
wget | wget-ssl) wget | wget-ssl)
DL_Template="$(which wget) --quiet --no-check-certificate --no-dns-cache -x -4 --tries 1 --timeout 5 -O" DL_Template="$(which wget) --quiet --no-check-certificate -x -4 --tries 1 --timeout 10 -O"
;; ;;
curl) curl)
DL_Template="$(which curl) --silent --insecure -L -k --connect-timeout 5 --retry 1 -o" DL_Template="$(which curl) --silent --insecure -L -k --connect-timeout 10 --retry 1 -o"
;; ;;
uclient-fetch) uclient-fetch)
DL_Template="$(which uclient-fetch) --quiet --no-check-certificate -4 --timeout 5 -O" DL_Template="$(which uclient-fetch) --quiet --no-check-certificate -4 --timeout 10 -O"
;; ;;
esac esac
[[ ${Test_Mode} == 1 || ${Verbose_Mode} == 1 ]] && { [[ ${Test_Mode} == 1 || ${Verbose_Mode} == 1 ]] && {
DL_Template="${DL_Template/ --quiet / }" DL_Template="${DL_Template/ --quiet / }"
DL_Template="${DL_Template/ --silent / }" DL_Template="${DL_Template/ --silent / }"
} }
[[ -n ${DL_Timeout} ]] && DL_Template="${DL_Template/-timeout 5/-timeout ${DL_Timeout}}" [[ -n ${DL_Timeout} ]] && DL_Template="${DL_Template/-timeout 10/-timeout ${DL_Timeout}}"
local E=0 u;while [[ ${E} != ${DL_URL_Count} ]];do local E=0 u;while [[ ${E} != ${DL_URL_Count} ]];do
DL_URL_Cache="${DL_URL[$E]}" DL_URL_Cache="${DL_URL[$E]}"
DL_Retries="${DL_URL_Cache##*@@}" DL_Retries="${DL_URL_Cache##*@@}"