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.5.4 重新添加固件体积显示; 优化更新日志

This commit is contained in:
Hyy2001X 2021-08-01 23:54:22 +08:00
parent d71fb458d1
commit 73ca878749
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Scripts/AutoUpdate.sh
View File

@ -3,7 +3,7 @@
# AutoUpdate for Openwrt # AutoUpdate for Openwrt
# Depends on: bash wget-ssl/wget/uclient-fetch curl x86:gzip openssl # Depends on: bash wget-ssl/wget/uclient-fetch curl x86:gzip openssl
Version=V6.5.3 Version=V6.5.4
ENV_DEPENDS="Author Github TARGET_PROFILE TARGET_BOARD TARGET_SUBTARGET Firmware_Type CURRENT_Version OP_Maintainer OP_BRANCH OP_REPO_NAME REGEX_Firmware" ENV_DEPENDS="Author Github TARGET_PROFILE TARGET_BOARD TARGET_SUBTARGET Firmware_Type CURRENT_Version OP_Maintainer OP_BRANCH OP_REPO_NAME REGEX_Firmware"
TITLE() { TITLE() {
@ -253,6 +253,7 @@ CHANGE_GITHUB() {
[[ ! ${Github} == $1 ]] && { [[ ! ${Github} == $1 ]] && {
EDIT_VARIABLE edit ${Custom_Variable} Github $1 EDIT_VARIABLE edit ${Custom_Variable} Github $1
ECHO y "Github 地址已修改为: $1" ECHO y "Github 地址已修改为: $1"
REMOVE_CACHE
} }
EXIT 0 EXIT 0
} }
@ -344,15 +345,15 @@ GET_FW_LOG() {
FW_Version="$1" FW_Version="$1"
;; ;;
esac esac
if [[ -z $(find ${Run_Path} -type f -mmin -1 -name Update_Logs.json) || ! -s ${Run_Path}/Update_Logs.json ]];then if [[ -z $(find ${Run_Path} -type f -mmin -1 -name FW_Logs.json) || ! -s ${Run_Path}/FW_Logs.json ]];then
rm -f ${Run_Path}/Update_Logs.json rm -f ${Run_Path}/FW_Logs.json
DOWNLOADER ${Run_Path}/Update_Logs.json ${Release_URL}/Update_Logs.json DOWNLOADER ${Run_Path}/FW_Logs.json ${Release_URL}/Update_Logs.json
[[ $? == 0 || -s ${Run_Path}/Update_Logs.json ]] && { [[ $? == 0 || -s ${Run_Path}/FW_Logs.json ]] && {
touch -a ${Run_Path}/Update_Logs.json touch -a ${Run_Path}/FW_Logs.json
} || rm -f ${Run_Path}/Update_Logs.json } || rm -f ${Run_Path}/FW_Logs.json
fi fi
[[ -f ${Run_Path}/Update_Logs.json ]] && { [[ -s ${Run_Path}/FW_Logs.json ]] && {
Result=$(jsonfilter -e '@["'"""${TARGET_PROFILE}"""'"]["'"""${FW_Version}"""'"]' < ${Run_Path}/Update_Logs.json) Result=$(jsonfilter -e '@["'"""${TARGET_PROFILE}"""'"]["'"""${FW_Version}"""'"]' < ${Run_Path}/FW_Logs.json 2>/dev/null)
[[ -n ${Result} ]] && { [[ -n ${Result} ]] && {
echo -e "\n${Grey}${FW_Version} for ${TARGET_PROFILE} 更新日志:" echo -e "\n${Grey}${FW_Version} for ${TARGET_PROFILE} 更新日志:"
echo -e "\n${Green}${Result}${White}" echo -e "\n${Green}${Result}${White}"
@ -398,6 +399,13 @@ GET_CLOUD_VERSION() {
[[ -n ${Z} ]] && echo "$Z" [[ -n ${Z} ]] && echo "$Z"
} }
GET_CLOUD_FW_SIZE() {
local X Y
let X="$(grep -n "$1" ${Run_Path}/Github_Tags | tail -1 | cut -d : -f 1)-4"
let Y="$(sed -n "${X}p" ${Run_Path}/Github_Tags | egrep -o "[0-9]+" | awk '{print ($1)/1048576}' | awk -F. '{print $1}')+1"
[[ ${Y} =~ [0-9] ]] && echo "${Y}M"
}
CHECK_UPDATES() { CHECK_UPDATES() {
local A local A
ECHO "正在检查版本更新 ..." ECHO "正在检查版本更新 ..."
@ -523,6 +531,7 @@ $([[ ${TARGET_BOARD} == x86 ]] && echo "固件格式: ${Firmware_Type} / ${x86_B
$(echo -e "当前固件版本: ${CURRENT_Version}${CURRENT_Type}") $(echo -e "当前固件版本: ${CURRENT_Version}${CURRENT_Type}")
$(echo -e "云端固件版本: ${CLOUD_FW_Version}${CHECKED_Type}") $(echo -e "云端固件版本: ${CLOUD_FW_Version}${CHECKED_Type}")
云端固件体积: $(GET_CLOUD_FW_SIZE ${CLOUD_FW_Name})
云端固件名称: ${CLOUD_FW_Name} 云端固件名称: ${CLOUD_FW_Name}
固件下载地址: ${CLOUD_FW_URL} 固件下载地址: ${CLOUD_FW_URL}