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.4 修复脚本更新错误

This commit is contained in:
Hyy2001X 2021-11-15 20:35:24 +08:00
parent 13c41d7e8b
commit c190230306
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
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.7.3 Version=V6.7.4
function TITLE() { function TITLE() {
clear && echo "Openwrt-AutoUpdate Script by Hyy2001 ${Version}" clear && echo "Openwrt-AutoUpdate Script by Hyy2001 ${Version}"
@ -324,29 +324,30 @@ function CHANGE_BOOT() {
} }
function UPDATE_SCRIPT() { function UPDATE_SCRIPT() {
[[ -s $1 ]] && {
ECHO r "AutoUpdate 脚本保存路径有误,请重新输入!"
EXIT 1
}
if [[ ! -d $1 ]];then if [[ ! -d $1 ]];then
mkdir -p $1 2> /dev/null || { mkdir -p $1 2> /dev/null || {
ECHO r "脚本存放路径 [$1] 创建失败!" ECHO r "脚本保存路径 [$1] 创建失败!"
EXIT 1 EXIT 1
} }
fi fi
DOWNLOADER --file-name AutoUpdate.sh --no-url-name --dl ${DOWNLOADERS} --url "$2" --path /tmp --timeout 5 --type 脚本 ECHO "脚本保存路径: [$1]"
if [[ -s /tmp/AutoUpdate.sh ]];then DOWNLOADER --file-name AutoUpdate.sh --no-url-name --dl ${DOWNLOADERS} --url $2 --path ${Tmp_Path} --timeout 5 --type 脚本
chmod +x /tmp/AutoUpdate.sh if [[ -s ${Tmp_Path}/AutoUpdate.sh ]];then
Script_Version=$(awk -F '=' '/Version/{print $2}' /tmp/AutoUpdate.sh | awk 'NR==1') chmod +x ${Tmp_Path}/AutoUpdate.sh
Script_Version=$(awk -F '=' '/Version/{print $2}' ${Tmp_Path}/AutoUpdate.sh | awk 'NR==1')
Banner_Version=$(egrep -o "V[0-9.]+" /etc/banner) Banner_Version=$(egrep -o "V[0-9.]+" /etc/banner)
mv -f /tmp/AutoUpdate.sh $1 mv -f ${Tmp_Path}/AutoUpdate.sh $1 2> /dev/null
ECHO "脚本保存路径: [$1]" [[ $? == 0 ]] && {
[[ -n ${Banner_Version} && $1 == /bin ]] && sed -i "s?${Banner_Version}?${Script_Version}?g" /etc/banner [[ -n ${Banner_Version} && $1 == /bin ]] && sed -i "s?${Banner_Version}?${Script_Version}?g" /etc/banner
ECHO y "[${Banner_Version} > ${Script_Version}] AutoUpdate 脚本更新成功!" ECHO y "[${Banner_Version} > ${Script_Version}] AutoUpdate 脚本更新成功!"
REMOVE_CACHE REMOVE_CACHE
EXIT 0 EXIT 0
} || {
ECHO r "无法移动 AutoUpdate 脚本到指定的路径!"
EXIT 1
}
else else
ECHO r "AutoUpdate 脚本更新失败!" ECHO r "AutoUpdate 脚本下载失败!"
EXIT 1 EXIT 1
fi fi
} }
@ -359,7 +360,6 @@ function CHECK_DEPENDS() {
if [[ $1 =~ : ]];then if [[ $1 =~ : ]];then
[[ $(echo $1 | cut -d ":" -f1) == ${TARGET_BOARD} ]] && { [[ $(echo $1 | cut -d ":" -f1) == ${TARGET_BOARD} ]] && {
PKG="$(echo "$1" | cut -d ":" -f2)" PKG="$(echo "$1" | cut -d ":" -f2)"
[[ $(echo "${PKG}" | wc -c) -gt 8 ]] && Tab=" " || Tab=" "
printf "%-25s %-5s\n" ${PKG} $(CHECK_PKG ${PKG}) printf "%-25s %-5s\n" ${PKG} $(CHECK_PKG ${PKG})
} }
else else
@ -374,10 +374,12 @@ function CHECK_TIME() {
[[ -s $1 && -n $(find $1 -type f -mmin -$2) ]] && { [[ -s $1 && -n $(find $1 -type f -mmin -$2) ]] && {
LOGGER "[CHECK_TIME] 文件: [$1] 距离修改时间小于 $2 分钟!" LOGGER "[CHECK_TIME] 文件: [$1] 距离修改时间小于 $2 分钟!"
echo true echo true
return 0
} || { } || {
LOGGER "[CHECK_TIME] 文件: [$1] 验证失败!" LOGGER "[CHECK_TIME] 文件: [$1] 验证失败!"
RM $1 RM $1
echo false echo false
return 1
} }
} }
@ -426,7 +428,7 @@ function ANALYZE_API() {
function GET_CLOUD_LOG() { function GET_CLOUD_LOG() {
local Result Version local Result Version
[[ ! $(cat ${API_File} 2> /dev/null) =~ Update_Logs.json ]] && { [[ ! $(cat ${API_File} 2> /dev/null) =~ Update_Logs.json ]] && {
LOGGER "[GET_CLOUD_LOG] 未检测到云端日志文件!" LOGGER "[GET_CLOUD_LOG] 未检测到已部署的云端日志!"
return 1 return 1
} }
case "$1" in case "$1" in