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.8.6 修复脚本更新失败

This commit is contained in:
Hyy2001X 2022-03-23 20:59:09 +08:00
parent d27d0492dc
commit 3785c2f78f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Scripts/AutoUpdate.sh
View File

@ -3,7 +3,7 @@
# AutoUpdate for Openwrt # AutoUpdate for Openwrt
# Dependences: wget-ssl/wget/uclient-fetch curl jq expr sysupgrade # Dependences: wget-ssl/wget/uclient-fetch curl jq expr sysupgrade
Version=V6.8.5 Version=V6.8.6
function TITLE() { function TITLE() {
clear && echo "Openwrt-AutoUpdate Script by Hyy2001 ${Version}" clear && echo "Openwrt-AutoUpdate Script by Hyy2001 ${Version}"
@ -429,7 +429,7 @@ function UPDATE_SCRIPT() {
} }
fi fi
ECHO "脚本保存路径: [$1]" ECHO "脚本保存路径: [$1]"
DOWNLOADER --file-name AutoUpdate.sh --no-url-name --dl ${DL_DEPENDS[@]} --url $2 --path ${Tmp_Path} --timeout 5 --type 脚本 DOWNLOADER --file-name AutoUpdate.sh --no-url-name --dl ${DL_DEPENDS[@]} --url "$2" --path ${Tmp_Path} --timeout 5 --type 脚本
if [[ $? == 0 && -s ${Tmp_Path}/AutoUpdate.sh ]];then if [[ $? == 0 && -s ${Tmp_Path}/AutoUpdate.sh ]];then
chmod +x ${Tmp_Path}/AutoUpdate.sh chmod +x ${Tmp_Path}/AutoUpdate.sh
Script_Version="$(awk -F '=' '/Version/{print $2}' ${Tmp_Path}/AutoUpdate.sh | awk 'NR==1')" Script_Version="$(awk -F '=' '/Version/{print $2}' ${Tmp_Path}/AutoUpdate.sh | awk 'NR==1')"
@ -511,7 +511,7 @@ function ANALYZE_API() {
case ${name} in case ${name} in
AutoBuild-${OP_REPO}-${TARGET_PROFILE}-* | Update_Logs.json) AutoBuild-${OP_REPO}-${TARGET_PROFILE}-* | Update_Logs.json)
LOGGER "可用固件/日志: ${name}" LOGGER "可用固件/日志: ${name}"
eval format=$(echo ${name} | egrep -o "\-[0-9a-z]{5}.[a-z].+" | egrep -o "\..+" | cut -c2-10) eval format=$(echo ${name} | egrep -o '\.[a-z]+.+' | cut -c2-10)
eval version=$(echo ${name} | egrep -o "R[0-9.]+-[0-9]+") eval version=$(echo ${name} | egrep -o "R[0-9.]+-[0-9]+")
eval sha256=$(echo ${name} | egrep -o "\-[a-z0-9]+" | cut -c2-6 | awk 'END{print}') eval sha256=$(echo ${name} | egrep -o "\-[a-z0-9]+" | cut -c2-6 | awk 'END{print}')
eval browser_download_url=$(jq ".assets[${i}].browser_download_url" ${API_Cache} 2> /dev/null) eval browser_download_url=$(jq ".assets[${i}].browser_download_url" ${API_Cache} 2> /dev/null)
@ -1267,7 +1267,7 @@ function AutoUpdate_Main() {
;; ;;
-x) -x)
shift shift
Script_URL="$(URL_X ${Github_Raw}/Scripts/AutoUpdate.sh G@@1 F@@1 X@@1)" Script_URL="$(URL_X ${Github_Raw}/Scripts/AutoUpdate.sh X@@3)"
[[ $(NETWORK_CHECK 223.5.5.5 2) == false ]] && { [[ $(NETWORK_CHECK 223.5.5.5 2) == false ]] && {
ECHO r "网络连接错误,请稍后再试!" ECHO r "网络连接错误,请稍后再试!"
EXIT 1 EXIT 1
@ -1275,7 +1275,7 @@ function AutoUpdate_Main() {
Script_Path=/bin Script_Path=/bin
[[ ${Custom_Path} ]] && Script_Path="${Custom_Path}" [[ ${Custom_Path} ]] && Script_Path="${Custom_Path}"
[[ ${Custom_URL} ]] && Script_URL="${Custom_URL}" [[ ${Custom_URL} ]] && Script_URL="${Custom_URL}"
UPDATE_SCRIPT ${Script_Path} ${Script_URL} UPDATE_SCRIPT ${Script_Path} "${Script_URL}"
EXIT EXIT
;; ;;
-B | --boot-mode) -B | --boot-mode)