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

Bump to V3.6

This commit is contained in:
Hyy2001X 2020-10-03 02:04:28 +08:00 committed by GitHub
parent 05b38affda
commit be782102ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Customize/AutoUpdate.sh
View File

@ -3,7 +3,7 @@
# AutoBuild Module by Hyy2001 # AutoBuild Module by Hyy2001
# AutoUpdate # AutoUpdate
Version=V3.5 Version=V3.6
DEFAULT_DEVICE=d-team_newifi-d2 DEFAULT_DEVICE=d-team_newifi-d2
Github=https://github.com/Hyy2001X/AutoBuild-Actions Github=https://github.com/Hyy2001X/AutoBuild-Actions
@ -17,20 +17,18 @@ cd /etc
CURRENT_VERSION=`awk 'NR==1' ./openwrt_info` CURRENT_VERSION=`awk 'NR==1' ./openwrt_info`
CURRENT_DEVICE=`jsonfilter -e '@.model.id' < "/etc/board.json" | tr ',' '_'` CURRENT_DEVICE=`jsonfilter -e '@.model.id' < "/etc/board.json" | tr ',' '_'`
clear && echo "Openwrt-AutoUpdate Script $Version" clear && echo "Openwrt-AutoUpdate Script $Version"
if [[ ! $1 == "" ]];then if [[ $1 == "" ]];then
Upgrade_Option="$1" Upgrade_Option="-q" && TIME && echo "执行: 保留配置升级"
[ "$Upgrade_Option" == "-n" ] && TIME && echo "不保留配置升级."
else else
Upgrade_Option="-q" Upgrade_Option="$1"
[ "$Upgrade_Option" == "-n" ] && TIME && echo "执行: 不保留配置升级"
if [ "$Upgrade_Option" == "-x" ];then
Upgrade_Option="-q"
Force_Update=1
TIME && echo "执行: 保留配置强制升级"
fi
fi fi
opkg list | awk '{print $1}' > /tmp/Package_list
grep "curl" /tmp/Package_list > /dev/null 2>&1
if [ ! $? -ne 0 ];then
Google_Check=`curl -I -s --connect-timeout 5 www.google.com -w %{http_code} | tail -n1`
[ ! "$Google_Check" == 200 ] && TIME && echo "Google 连接失败,可能导致固件下载速度缓慢!"
fi
grep "wget" /tmp/Package_list > /dev/null 2>&1
[ $? -ne 0 ] && TIME && echo "未安装 wget!请先执行[opkg update && opkg install wget]" && exit
if [ "$CURRENT_VERSION" == "" ];then if [ "$CURRENT_VERSION" == "" ];then
echo -e "\n警告:当前固件版本获取失败!" echo -e "\n警告:当前固件版本获取失败!"
CURRENT_VERSION=未知 CURRENT_VERSION=未知
@ -48,14 +46,16 @@ if [ "$GET_Version" == "" ];then
fi fi
echo -e "\n当前固件版本:$CURRENT_VERSION" echo -e "\n当前固件版本:$CURRENT_VERSION"
echo -e "云端固件版本:$GET_Version\n" echo -e "云端固件版本:$GET_Version\n"
if [ $CURRENT_VERSION == $GET_Version ];then if [[ ! $Force_Update == 1 ]];then
read -p "已是最新版本,是否强制更新固件?[Y/n]:" Choose if [ $CURRENT_VERSION == $GET_Version ];then
if [ $Choose == Y ] || [ $Choose == y ];then read -p "已是最新版本,是否强制更新固件?[Y/n]:" Choose
TIME && echo -e "开始强制更新固件...\n" if [ $Choose == Y ] || [ $Choose == y ];then
else TIME && echo -e "开始强制更新固件...\n"
TIME && echo "用户已取消强制更新,即将退出更新程序..." else
sleep 2 TIME && echo "用户已取消强制更新,即将退出更新程序..."
exit sleep 2
exit
fi
fi fi
fi fi
Firmware_Info="AutoBuild-${CURRENT_DEVICE}-Lede-${GET_Version}" Firmware_Info="AutoBuild-${CURRENT_DEVICE}-Lede-${GET_Version}"