V4.3 取消网络连接测试失败后的强制退出脚本动作

Customize/AutoUpdate.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 # https://github.com/Hyy2001X/AutoBuild-Actions
 # AutoBuild Module by Hyy2001
-# AutoUpdate
+# AutoUpdate for Openwrt
 
-Version=V4.2
+Version=V4.3
 DEFAULT_DEVICE=d-team_newifi-d2
 Github=https://github.com/Hyy2001X/AutoBuild-Actions
 
@@ -19,14 +19,14 @@ CURRENT_VERSION=$(awk 'NR==1' openwrt_info)
 CURRENT_DEVICE=$(jsonfilter -e '@.model.id' < "/etc/board.json" | tr ',' '_')
 clear && echo "Openwrt-AutoUpdate Script ${Version}"
 if [[ -z "$1" ]];then
-	Upgrade_Options="-q" && TIME && echo "执行: 保留配置升级固件"
+	Upgrade_Options="-q" && TIME && echo "执行: 保留配置更新固件"
 else
 	Upgrade_Options="$1"
-	[[ "${Upgrade_Options}" == "-n" ]] && TIME && echo "执行: 不保留配置升级固件"
+	[[ "${Upgrade_Options}" == "-n" ]] && TIME && echo "执行: 不保留配置更新固件"
 	if [[ "${Upgrade_Options}" == "-x" ]];then
 		Upgrade_Options="-q"
 		Force_Update="1"
-		TIME && echo "执行: 保留配置强制升级"
+		TIME && echo "执行: 保留配置强制更新"
 	else
 		Force_Update="0"
 	fi
@@ -34,8 +34,6 @@ 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
 	Google_Check=$(curl -I -s --connect-timeout 5 www.google.com -w %{http_code} | tail -n1)
 	[ ! "$Google_Check" == 200 ] && TIME && echo "Google 连接失败,可能导致固件下载速度缓慢!"
 fi
@@ -51,7 +49,7 @@ if [[ $? -ne 0 ]];then
 		opkg update > /dev/null 2>&1
 		opkg install wget
 	else
-		TIME && echo "用户已取消安装,即将退出更新程序..."
+		TIME && echo "用户已取消安装,即将退出更新脚本..."
 		sleep 2
 		exit
 	fi
@@ -84,7 +82,7 @@ if [[ ! ${Force_Update} == 1 ]];then
 		if [[ "${Choose}" == Y ]] || [[ "${Choose}" == y ]];then
 			TIME && echo -e "开始强制更新固件...\n"
 		else
-			TIME && echo "用户已取消强制更新,即将退出更新程序..."
+			TIME && echo "已取消强制更新,即将退出更新程序..."
 			sleep 2
 			exit
 		fi
@@ -98,19 +96,19 @@ cd /tmp
 TIME && echo "正在下载固件,请耐心等待..."
 wget -q ${Github_Download}/${Firmware} -O ${Firmware}
 if [[ ! $? == 0 ]];then
-	TIME && echo "下载失败,请检查网络后重试!"
+	TIME && echo "固件下载失败,请检查网络后重试!"
 	exit
 fi
 TIME && echo "下载成功!固件大小:$(du -h ${Firmware} | awk '{print $1}')B"
-TIME && echo "正在下载固件详细信息..."
+TIME && echo "正在获取云端固件MD5,请耐心等待..."
 wget -q ${Github_Download}/${Firmware_Detail} -O ${Firmware_Detail}
 if [[ ! $? == 0 ]];then
-	TIME && echo "下载失败,请检查网络后重试!"
+	TIME && echo "MD5 获取失败,请检查网络后重试!"
 	exit
 fi
 GET_MD5=$(awk -F '[ :]' '/MD5/ {print $2;exit}' ${Firmware_Detail})
 CURRENT_MD5=$(md5sum ${Firmware} | cut -d ' ' -f1)
-echo -e "\n当前固件MD5:${CURRENT_MD5}"
+echo -e "\n本地固件MD5:${CURRENT_MD5}"
 echo "云端固件MD5:${GET_MD5}"
 if [[ -z "${GET_MD5}" ]] || [[ -z "${CURRENT_MD5}" ]];then
 	echo -e "\nMD5 获取失败!"
@@ -119,7 +117,9 @@ fi
 if [[ ! "${GET_MD5}" == "${CURRENT_MD5}" ]];then
 	echo -e "\nMD5 对比失败,请检查网络后重试!"
 	exit
+else
+	TIME && echo -e "MD5 对比通过!"
 fi
-TIME && echo -e "MD5 对比通过,开始更新固件,请耐心等待路由器至重启...\n"
+TIME && echo -e "开始更新固件,请耐心等待路由器重启...\n"
 sleep 3
 sysupgrade ${Upgrade_Options} ${Firmware}