Merge code from BETA repo

Customize/AutoUpdate.sh

@@ -3,7 +3,7 @@
 # AutoBuild Module by Hyy2001
 # AutoUpdate
 
-Version=V3.3-BETA
+Version=V3.4
 DEFAULT_DEVICE=d-team_newifi-d2
 Github=https://github.com/Hyy2001X/AutoBuild-Actions
 
@@ -23,18 +23,26 @@ if [[ ! $1 == "" ]];then
 else
 	Upgrade_Option="-q"
 fi
-if [ "$CURRENT_VERSION" == "" ]; then
+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
 	echo -e "\n警告:当前固件版本获取失败!"
 	CURRENT_VERSION=未知
 fi
-if [ "$CURRENT_DEVICE" == "" ]; then
+if [ "$CURRENT_DEVICE" == "" ];then
 	echo -e "\n警告:当前设备名称获取失败,使用预设名称[$DEFAULT_DEVICE]"
 	CURRENT_DEVICE=$DEFAULT_DEVICE
 fi
 cd /tmp
 TIME && echo "正在获取云端固件版本..."
 GET_Version=`wget -q $Github_Tags -O - | egrep -o 'R[0-9]+.[0-9]+.[0-9]+.[0-9]+' | awk 'NR==1'`
-if [ "$GET_Version" == "" ]; then
+if [ "$GET_Version" == "" ];then
 	TIME && echo "云端固件版本获取失败,请稍后重试!"
 	exit
 fi
@@ -54,10 +62,6 @@ Firmware_Info="AutoBuild-${CURRENT_DEVICE}-Lede-${GET_Version}"
 Firmware="${Firmware_Info}.bin"
 Firmware_Detail="${Firmware_Info}.detail"
 echo "云端固件名称:$Firmware"
-Google_Check=`curl -I -s --connect-timeout 5 www.google.com -w %{http_code} | tail -n1`
-if [ ! "$Google_Check" == 200 ];then
-	TIME && echo "Google 连接失败,可能导致固件下载速度缓慢!"
-fi
 TIME && echo "正在下载固件,请耐心等待..."
 wget -q $Github_Download/$Firmware -O $Firmware
 if [ ! "$?" == 0 ]; then
@@ -80,10 +84,10 @@ if [ "$GET_MD5" == "" ] || [ "$CURRENT_MD5" == "" ];then
 	exit
 fi
 if [ ! "$GET_MD5" == "$CURRENT_MD5" ];then
-	echo -e "\nMD5对比不通过,请检查网络后重试!"
+	echo -e "\nMD5对比失败,请检查网络后重试!"
 	exit
 fi
-TIME && echo "MD5对比通过,准备升级固件..."
+TIME && echo "MD5对比通过!"
 sleep 3
 TIME && echo -e "开始升级固件,请耐心等待...\n"
-sysupgrade ${Upgrade_Option} $Firmware
+sysupgrade ${Upgrade_Option} $Firmware

Customize/banner

@@ -0,0 +1,8 @@
+  _______                     ________        __
+ |       |.-----.-----.-----.|  |  |  |.----.|  |_
+ |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
+ |_______||   __|_____|__|__||________||__|  |____|
+          |__| W I R E L E S S   F R E E D O M
+ -----------------------------------------------------
+      Openwrt
+ -----------------------------------------------------