diff --git a/Customize/AutoUpdate.sh b/Customize/AutoUpdate.sh index b3d7179..b34612d 100644 --- a/Customize/AutoUpdate.sh +++ b/Customize/AutoUpdate.sh @@ -3,7 +3,7 @@ # AutoBuild Module by Hyy2001 # AutoUpdate -Version=V4.1 +Version=V4.2 DEFAULT_DEVICE=d-team_newifi-d2 Github=https://github.com/Hyy2001X/AutoBuild-Actions @@ -27,21 +27,27 @@ else Upgrade_Options="-q" Force_Update="1" TIME && echo "执行: 保留配置强制升级" + else + Force_Update="0" fi fi opkg list | awk '{print $1}' > /tmp/Package_list grep "curl" /tmp/Package_list > /dev/null 2>&1 if [[ ! $? -ne 0 ]];then Baidu_Check=$(curl -I -s --connect-timeout 5 www.baidu.com -w %{http_code} | tail -n1) - [ ! "$Baidu_Check" == 200 ] && TIME && echo "网络连接失败,请检查连接后重试!" && exit + [ ! "$Baidu_Check" == 200 ] && TIME && echo "网络连接失败,请检查网络连接后重试!" && exit 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 if [[ $? -ne 0 ]];then - TIME && read -p "未安装 wget,是否执行安装?[Y/n]:" Choose - if [ "${Choose}" == Y ] || [ "${Choose}" == y ];then - TIME && echo -e "开始安装 wget,请耐心等待...\n" + if [[ "${Force_Update}" == "1" ]];then + Choose="Y" + else + TIME && read -p "未安装[wget],是否执行安装?[Y/n]:" Choose + fi + if [[ "${Choose}" == Y ]] || [[ "${Choose}" == y ]];then + TIME && echo -e "开始安装[wget],请耐心等待...\n" opkg update > /dev/null 2>&1 opkg install wget else @@ -55,6 +61,7 @@ if [[ -z "${CURRENT_VERSION}" ]];then CURRENT_VERSION="未知" fi if [[ -z "${CURRENT_DEVICE}" ]];then + [[ "${Upgrade_Options}" == "-x" ]] && exit TIME && echo "警告: 当前设备名称获取失败,使用预设名称[$DEFAULT_DEVICE]" CURRENT_DEVICE="${DEFAULT_DEVICE}" fi @@ -72,9 +79,9 @@ echo "设备名称: ${DEFAULT_DEVICE}" echo -e "\n当前固件版本: ${CURRENT_VERSION}" echo -e "云端固件版本: ${GET_Version}" if [[ ! ${Force_Update} == 1 ]];then - if [ "${CURRENT_VERSION}" == "${GET_Version}" ];then + if [[ "${CURRENT_VERSION}" == "${GET_Version}" ]];then TIME && read -p "已是最新版本,是否强制更新固件?[Y/n]:" Choose - if [ "${Choose}" == Y ] || [ "${Choose}" == y ];then + if [[ "${Choose}" == Y ]] || [[ "${Choose}" == y ]];then TIME && echo -e "开始强制更新固件...\n" else TIME && echo "用户已取消强制更新,即将退出更新程序..." @@ -113,6 +120,6 @@ if [[ ! "${GET_MD5}" == "${CURRENT_MD5}" ]];then echo -e "\nMD5对比失败,请检查网络后重试!" exit fi -TIME && echo -e "开始升级固件,请耐心等待...\n" +TIME && echo -e "MD5 对比通过,开始更新固件,请耐心等待路由器至重启...\n" sleep 3 sysupgrade ${Upgrade_Options} ${Firmware}