V5.7.4 优化代码、添加命令执行成功/失败对应颜色提示

2021-05-13 17:12:35 +08:00 · 2021-05-13 17:12:35 +08:00 · 694b91671c
parent e6d2802108
commit 694b91671c
1 changed files with 129 additions and 116 deletions
--- a/Scripts/AutoUpdate.sh
+++ b/Scripts/AutoUpdate.sh
@ -3,7 +3,7 @@
 # AutoBuild Module by Hyy2001
 # AutoUpdate for Openwrt

-Version=V5.7.3
+Version=V5.7.4

 Shell_Helper() {
 cat <<EOF
@ -62,25 +62,25 @@ EOF
 }

 Install_Pkg() {
-	PKG_NAME=$1
-	if [[ ! "$(cat /tmp/Package_list)" =~ "${PKG_NAME}" ]];then
+	export PKG_NAME=$1
+	if [[ ! "$(cat /${Download_Path}/Installed_PKG_List)" =~ "${PKG_NAME}" ]];then
 		[[ "${Force_Update}" == 1 ]] || [[ "${AutoUpdate_Mode}" == 1 ]] && {
-			Choose=Y
+			export Choose=Y
 		} || {
 			TIME && read -p "未安装[${PKG_NAME}],是否执行安装?[Y/n]:" Choose
 		}
 		if [[ "${Choose}" == Y ]] || [[ "${Choose}" == y ]];then
-			TIME && echo -e "开始安装[${PKG_NAME}],请耐心等待...\n"
+			TIME "开始安装[${PKG_NAME}],请耐心等待...\n"
 			opkg update > /dev/null 2>&1
 			opkg install ${PKG_NAME}
 			[[ ! $? -ne 0 ]] && {
-				TIME && echo "[${PKG_NAME}] 安装成功!"
+				TIME "[${PKG_NAME}] 安装成功!"
 			} || {
-				TIME && echo "[${PKG_NAME}] 安装失败,请尝试手动安装!"
+				TIME "[${PKG_NAME}] 安装失败,请尝试手动安装!"
 				exit 1
 			}
 		else
-			TIME && echo "用户已取消安装,即将退出更新脚本..."
+			TIME "用户已取消安装,即将退出更新脚本..."
 			sleep 2
 			exit 0
 		fi
@ -88,99 +88,112 @@ Install_Pkg() {
 }

 TIME() {
+	[[ -z "$1" ]] && {
 		echo -ne "\n[$(date "+%H:%M:%S")] "
+	} || {
+	    case $1 in
+		r) export Color="\e[31m";;
+		g) export Color="\e[32m";;
+		b) export Color="\e[34m";;
+		y) export Color="\e[33m";;
+	    esac
+		[[ $# -lt 2 ]] && echo -e "\n\e[36m[$(date "+%H:%M:%S")]\e[0m ${1}" || {
+			echo -e "\n\e[36m[$(date "+%H:%M:%S")]\e[0m ${Color}${2}\e[0m"
+	    }
+	}
 }

 [ -f /etc/openwrt_info ] && source /etc/openwrt_info || {
-	echo -e "\n未检测到 /etc/openwrt/info,无法运行更新程序!"
+	TIME r "未检测到 /etc/openwrt/info,无法运行更新程序!"
 	exit 1
 }
-Input_Option=$1
-Input_Other=$2
-Download_Path="/tmp/Downloads"
-opkg list | awk '{print $1}' > /tmp/Package_list
-Github_Release="${Github}/releases/download/AutoUpdate"
-Author="${Github##*com/}"
-CLOUD_Script="Hyy2001X/AutoBuild-Actions/master/Scripts/AutoUpdate.sh"
-Github_Tags="https://api.github.com/repos/${Author}/releases/latest"
-Github_Raw="https://raw.githubusercontent.com"
-_PROXY_Release="https://download.fastgit.org"
-TMP_Available="$(df -m | grep "/tmp" | awk '{print $4}' | awk 'NR==1' | awk -F. '{print $1}')"
-Overlay_Available="$(df -h | grep ":/overlay" | awk '{print $4}' | awk 'NR==1')"
-Retry_Times=4
+
+export Input_Option=$1
+export Input_Other=$2
+export Download_Path="/tmp/Downloads"
+export Github_Release="${Github}/releases/download/AutoUpdate"
+export Author="${Github##*com/}"
+export CLOUD_Script="Hyy2001X/AutoBuild-Actions/master/Scripts/AutoUpdate.sh"
+export Github_Tags="https://api.github.com/repos/${Author}/releases/latest"
+export Github_Raw="https://raw.githubusercontent.com"
+export _PROXY_Release="https://download.fastgit.org"
+export TMP_Available="$(df -m | grep "/tmp" | awk '{print $4}' | awk 'NR==1' | awk -F. '{print $1}')"
+export Overlay_Available="$(df -h | grep ":/overlay" | awk '{print $4}' | awk 'NR==1')"
+export Retry_Times=4
+opkg list | awk '{print $1}' > /${Download_Path}/Installed_PKG_List
 [ ! -d "${Download_Path}" ] && mkdir -p ${Download_Path}
 case ${DEFAULT_Device} in
 x86_64)
 	[[ -z "${Firmware_Type}" ]] && Firmware_Type=img
 	[[ "${Firmware_Type}" == img.gz ]] && {
-		Compressed_Firmware=1
-	} || Compressed_Firmware=0
+		export Compressed_Firmware=1
+	} || export Compressed_Firmware=0
 	[ -f /etc/openwrt_boot ] && {
-		BOOT_Type="-$(cat /etc/openwrt_boot)"
+		export BOOT_Type="-$(cat /etc/openwrt_boot)"
 	} || {
 		[ -d /sys/firmware/efi ] && {
-			BOOT_Type="-UEFI"
-		} || BOOT_Type="-Legacy"
+			export BOOT_Type="-UEFI"
+		} || export BOOT_Type="-Legacy"
 	}
 	case ${BOOT_Type} in
 	-Legacy)
-		EFI_Mode=0
+		export EFI_Mode=0
 	;;
 	-UEFI)
-		EFI_Mode=1
+		export EFI_Mode=1
 	;;
 	esac
-	Firmware_SFX="${BOOT_Type}.${Firmware_Type}"
-	Detail_SFX="${BOOT_Type}.detail"
-	CURRENT_Device=x86_64
-	Space_Min=480
+	export Firmware_SFX="${BOOT_Type}.${Firmware_Type}"
+	export Detail_SFX="${BOOT_Type}.detail"
+	export CURRENT_Device=x86_64
+	export Space_Min=480
 ;;
 *)
-	CURRENT_Device="$(jsonfilter -e '@.model.id' < /etc/board.json | tr ',' '_')"
-	Firmware_SFX=".${Firmware_Type}"
-	[[ -z ${Firmware_SFX} ]] && Firmware_SFX=".bin"
-	Detail_SFX=.detail
-	Space_Min=0
+	export CURRENT_Device="$(jsonfilter -e '@.model.id' < /etc/board.json | tr ',' '_')"
+	export Firmware_SFX=".${Firmware_Type}"
+	[[ -z ${Firmware_SFX} ]] && export Firmware_SFX=".bin"
+	export Detail_SFX=.detail
+	export Space_Min=0
 esac
 cd /etc
 clear && echo "Openwrt-AutoUpdate Script ${Version}"
 if [[ -z "${Input_Option}" ]];then
-	Upgrade_Options="-q"
-	TIME && echo "执行: 保留配置更新固件"
+	export Upgrade_Options="-q"
+	TIME g "执行: 保留配置更新固件"
 else
 	[[ "${Input_Option}" =~ p ]] && {
-		PROXY_Release="${_PROXY_Release}"
-		Github_Raw="https://raw.fastgit.org"
-		PROXY_ECHO="[FastGit] "
+		export PROXY_Release="${_PROXY_Release}"
+		export Github_Raw="https://raw.fastgit.org"
+		export PROXY_ECHO="[FastGit] "
 	} || {
-		PROXY_ECHO=""
+		export PROXY_ECHO=""
 	}
 	case ${Input_Option} in
 	-n | -f | -u | -p | -np | -pn | -fp | -pf | -up | -pu)
 		case ${Input_Option} in
 		-n | -np | -pn)
-			TIME && echo "${PROXY_ECHO}执行: 更新固件(不保留配置)"
-			Upgrade_Options="-n"
+			TIME g "${PROXY_ECHO}执行: 更新固件(不保留配置)"
+			export Upgrade_Options="-n"
 		;;
 		-f | -pf | -fp)
-			Force_Update=1
-			Upgrade_Options="-q"
-			TIME && echo "${PROXY_ECHO}执行: 强制更新固件(保留配置)"
+			export Force_Update=1
+			export Upgrade_Options="-q"
+			TIME g "${PROXY_ECHO}执行: 强制更新固件(保留配置)"
 		;;
 		-u | -pu | -up)
-			AutoUpdate_Mode=1
-			Upgrade_Options="-q"
+			export AutoUpdate_Mode=1
+			export Upgrade_Options="-q"
 		;;
 		-p | -pq | -qp)
-			Upgrade_Options="-q"
-			TIME && echo "${PROXY_ECHO}执行: 保留配置更新固件"
+			export Upgrade_Options="-q"
+			TIME g "${PROXY_ECHO}执行: 保留配置更新固件"
 		;;
 		esac
 	;;
 	-c)
 		if [[ -n "${Input_Other}" ]];then
 			sed -i "s?${Github}?${Input_Other}?g" /etc/openwrt_info
-			echo -e "\nGithub 地址已更换为: ${Input_Other}"
+			TIME y "Github 地址已更换为: ${Input_Other}"
 			unset Input_Other
 			exit 0
 		else
@ -192,7 +205,7 @@ else
 	;;
 	-d)
 		rm -f ${Download_Path}/*
-		TIME && echo "固件下载缓存清理完成!"
+		TIME y "固件下载缓存清理完成!"
 		exit 0
 	;;
 	-h)
@ -205,29 +218,29 @@ else
 			echo "${Input_Other}" > /etc/openwrt_boot
 			sed -i '/openwrt_boot/d' /etc/sysupgrade.conf
 			echo -e "\n/etc/openwrt_boot" >> /etc/sysupgrade.conf
-			TIME && echo "固件引导方式已指定为: ${Input_Other}!"
+			TIME y "固件引导方式已指定为: ${Input_Other}!"
 			exit 0
 		;;
 		*)
-			echo -e "\n错误的参数: [${Input_Other}],当前支持的选项: [UEFI/Legacy] !"
+			TIME r "错误的参数: [${Input_Other}],当前支持的选项: [UEFI/Legacy] !"
 			exit 1
 		;;
 		esac
 	;;
 	-x | -xp | -px)
-		CLOUD_Script=${Github_Raw}/Hyy2001X/AutoBuild-Actions/master/Scripts/AutoUpdate.sh
-		TIME && echo "${PROXY_ECHO}开始更新 AutoUpdate 脚本,请耐心等待..."
+		export CLOUD_Script=${Github_Raw}/Hyy2001X/AutoBuild-Actions/master/Scripts/AutoUpdate.sh
+		TIME "${PROXY_ECHO}开始更新 AutoUpdate 脚本,请耐心等待..."
 		wget -q --tries 3 --timeout 5 ${CLOUD_Script} -O ${Download_Path}/AutoUpdate.sh
 		if [[ $? == 0 ]];then
 			rm /bin/AutoUpdate.sh
 			mv -f ${Download_Path}/AutoUpdate.sh /bin
 			chmod +x /bin/AutoUpdate.sh
 			NEW_Version=$(egrep -o "V[0-9]+.[0-9].+" /bin/AutoUpdate.sh | awk 'NR==1')
-			TIME && echo "AutoUpdate [${Version}] > [${NEW_Version}]"
-			TIME && echo "AutoUpdate 脚本更新成功!"
+			TIME y "AutoUpdate [${Version}] > [${NEW_Version}]"
+			TIME y "AutoUpdate 脚本更新成功!"
 			exit 0
 		else
-			TIME && echo "AutoUpdate 脚本更新失败,请检查网络后重试!"
+			TIME r "AutoUpdate 脚本更新失败,请检查网络后重试!"
 			exit 1
 		fi	
 	;;
@ -237,143 +250,143 @@ else
 	;;
 	esac
 fi
-if [ -z "${PROXY_Release}" ];then
-	if [[ "$(cat /tmp/Package_list)" =~ "curl" ]];then
-		Google_Check=$(curl -I -s --connect-timeout 3 google.com -w %{http_code} | tail -n1)
+if [[ -z "${PROXY_Release}" ]];then
+	if [[ "$(cat /${Download_Path}/Installed_PKG_List)" =~ curl ]];then
+		export Google_Check=$(curl -I -s --connect-timeout 3 google.com -w %{http_code} | tail -n1)
 		[[ ! "$Google_Check" == 301 ]] && {
-			TIME && echo "Google 连接失败,尝试使用 [FastGit] 镜像加速!"
-			PROXY_Release="${_PROXY_Release}"
+			TIME r "Google 连接失败,尝试使用 [FastGit] 镜像加速!"
+			export PROXY_Release="${_PROXY_Release}"
 		}
 	else
-		TIME && echo "无法确定网络环境,默认开启 [FastGit] 镜像加速!"
-		PROXY_Release="${_PROXY_Release}"
+		TIME r "无法确定网络环境,默认开启 [FastGit] 镜像加速!"
+		export PROXY_Release="${_PROXY_Release}"
 	fi
 fi
 [[ "${TMP_Available}" -lt "${Space_Min}" ]] && {
-	TIME && echo "/tmp 空间不足: [${Space_Min}M],无法执行更新!"
+	TIME r "/tmp 空间不足: [${Space_Min}M],无法执行更新!"
 	exit 1
 }
 Install_Pkg wget
 if [[ -z "${CURRENT_Version}" ]];then
-	TIME && echo "警告: 当前固件版本获取失败!"
-	CURRENT_Version="Unknown"
+	TIME r "警告: 当前固件版本获取失败!"
+	export CURRENT_Version=Unknown
 fi
 if [[ -z "${CURRENT_Device}" ]];then
 	[[ -n "$DEFAULT_Device" ]] && {
-		TIME && echo "警告: 当前设备名称获取失败,使用预设名称: [$DEFAULT_Device]"
-		CURRENT_Device="${DEFAULT_Device}"
+		TIME r "警告: 当前设备名称获取失败,使用预设名称: [$DEFAULT_Device]"
+		export CURRENT_Device="${DEFAULT_Device}"
 	} || {
-		TIME && echo "未检测到设备名称!"
+		TIME r "未检测到设备名称,无法执行更新!"
 		exit 1
 	}
 fi
-TIME && echo "正在检查版本更新..."
-wget -q ${Github_Tags} -O - > ${Download_Path}/Github_Tags
+TIME "正在检查版本更新..."
+wget -q --timeout 5 ${Github_Tags} -O - > ${Download_Path}/Github_Tags
 [[ ! $? == 0 ]] && {
-	TIME && echo "检查更新失败,请稍后重试!"
+	TIME r "检查更新失败,请稍后重试!"
 	exit 1
 }
-TIME && echo "正在获取云端固件版本..."
-CLOUD_Firmware=$(cat ${Download_Path}/Github_Tags | egrep -o "AutoBuild-${CURRENT_Device}-R[0-9].+-[0-9]+${Firmware_SFX}" | awk 'END {print}')
-CLOUD_Version=$(echo ${CLOUD_Firmware} | egrep -o "R[0-9].+-[0-9]+")
+TIME "正在获取云端固件信息..."
+export CLOUD_Firmware=$(egrep -o "AutoBuild-${CURRENT_Device}-R[0-9].+-[0-9]+${Firmware_SFX}" ${Download_Path}/Github_Tags | awk 'END {print}')
+export CLOUD_Version=$(echo ${CLOUD_Firmware} | egrep -o "R[0-9].+-[0-9]+")
 [[ -z "${CLOUD_Version}" ]] && {
-	TIME && echo "云端固件版本获取失败!"
+	TIME r "云端固件信息获取失败!"
 	exit 1
 }
-Firmware_Name="$(echo ${CLOUD_Firmware} | egrep -o "AutoBuild-${CURRENT_Device}-R[0-9].+-[0-9]+")"
-Firmware="${CLOUD_Firmware}"
-Firmware_Detail="${Firmware_Name}${Detail_SFX}"
-let X=$(grep -n "${Firmware}" ${Download_Path}/Github_Tags | tail -1 | cut -d : -f 1)-4
-let CLOUD_Firmware_Size=$(sed -n "${X}p" ${Download_Path}/Github_Tags | egrep -o "[0-9]+" | awk '{print ($1)/1048576}' | awk -F. '{print $1}')+1
+export Firmware_Name="$(echo ${CLOUD_Firmware} | egrep -o "AutoBuild-${CURRENT_Device}-R[0-9].+-[0-9]+")"
+export Firmware="${CLOUD_Firmware}"
+export Firmware_Detail="${Firmware_Name}${Detail_SFX}"
+let X="$(grep -n "${Firmware}" ${Download_Path}/Github_Tags | tail -1 | cut -d : -f 1)-4"
+let CLOUD_Firmware_Size="$(sed -n "${X}p" ${Download_Path}/Github_Tags | egrep -o "[0-9]+" | awk '{print ($1)/1048576}' | awk -F. '{print $1}')+1"
 echo -e "\n固件作者: ${Author%/*}"
 echo "设备名称: ${CURRENT_Device}"
 echo "固件格式: ${Firmware_SFX}"
 echo -e "\n当前固件版本: ${CURRENT_Version}"
 echo "云端固件版本: ${CLOUD_Version}"
-echo "当前可用空间: ${TMP_Available}M"
-echo "云端固件大小: ${CLOUD_Firmware_Size}M"
+echo "可用空间: ${TMP_Available}M"
+echo "固件大小: ${CLOUD_Firmware_Size}M"
 if [[ ! "${Force_Update}" == 1 ]];then
 	[[ "${TMP_Available}" -lt "${CLOUD_Firmware_Size}" ]] && {
-		TIME && echo "/tmp 空间不足: [${CLOUD_Firmware_Size}M],无法执行更新!"
+		TIME r "/tmp 空间不足: [${CLOUD_Firmware_Size}M],无法执行更新!"
 		exit
 	}
 	if [[ "${CURRENT_Version}" == "${CLOUD_Version}" ]];then
 		[[ "${AutoUpdate_Mode}" == 1 ]] && exit 0
 		TIME && read -p "已是最新版本,是否强制更新固件?[Y/n]:" Choose
 		[[ "${Choose}" == Y ]] || [[ "${Choose}" == y ]] && {
-			TIME && echo "开始强制更新固件..."
+			TIME "开始强制更新固件..."
 		} || {
-			TIME && echo "已取消强制更新,即将退出更新程序..."
+			TIME "已取消强制更新,即将退出更新程序..."
 			sleep 2
 			exit 0
 		}
 	fi
 fi
-[[ -n "${PROXY_Release}" ]] && Github_Release=${PROXY_Release}/${Author}/releases/download/AutoUpdate
+[[ -n "${PROXY_Release}" ]] && export Github_Release="${PROXY_Release}/${Author}/releases/download/AutoUpdate"
 echo -e "\n云端固件名称: ${Firmware}"
 echo "固件下载地址: ${Github_Release}"
 echo "固件保存位置: ${Download_Path}"
 [ ! -d "${Download_Path}" ] && mkdir -p ${Download_Path}
 rm -f ${Download_Path}/*
-TIME && echo "正在下载固件,请耐心等待..."
+TIME "正在下载固件,请耐心等待..."
 cd ${Download_Path}
 while [ "${Retry_Times}" -ge 0 ];
 do
 	if [[ "${Retry_Times}" == 3 ]];then
 		[[ -z "${PROXY_Release}" ]] && {
-			TIME && echo "正在尝试使用 [FastGit] 镜像加速下载..."
-			Github_Release=${_PROXY_Release}/${Author}/releases/download/AutoUpdate
+			TIME "正在尝试使用 [FastGit] 镜像加速下载..."
+			export Github_Release="${_PROXY_Release}/${Author}/releases/download/AutoUpdate"
 		}
 	fi
 	if [[ "${Retry_Times}" == 0 ]];then
-		TIME && echo "固件下载失败,请检查网络后重试!"
+		TIME r "固件下载失败,请检查网络后重试!"
 		exit 1
 	else
 		wget -q --tries 1 --timeout 5 "${Github_Release}/${Firmware}" -O ${Firmware}
 		[[ $? == 0 ]] && break
 	fi
-	Retry_Times=$((${Retry_Times} - 1))
-	TIME && echo "下载失败,剩余尝试次数: [${Retry_Times}]"
+	export Retry_Times=$((${Retry_Times} - 1))
+	TIME r "下载失败,剩余尝试次数: [${Retry_Times}]"
 	sleep 1
 done
-TIME && echo "固件下载成功!"
-TIME && echo "正在获取云端固件MD5,请耐心等待..."
-wget -q ${Github_Release}/${Firmware_Detail} -O ${Firmware_Detail}
+TIME y "固件下载成功!"
+TIME "正在获取云端 MD5,请耐心等待..."
+wget -q --tries 3 --timeout 5 ${Github_Release}/${Firmware_Detail} -O ${Firmware_Detail}
 [[ ! $? == 0 ]] && {
-	TIME && echo "MD5 获取失败,请检查网络后重试!"
+	TIME r "云端 MD5 获取失败,请检查网络后重试!"
 	exit 1
 }
 CLOUD_MD5=$(awk -F '[ :]' '/MD5/ {print $2;exit}' ${Firmware_Detail})
 CURRENT_MD5=$(md5sum ${Firmware} | cut -d ' ' -f1)
-echo -e "\n本地固件MD5:${CURRENT_MD5}"
-echo "云端固件MD5:${CLOUD_MD5}"
 [[ -z "${CLOUD_MD5}" ]] || [[ -z "${CURRENT_MD5}" ]] && {
-	TIME && echo "MD5 获取失败!"
+	TIME r "MD5 获取失败!"
 	exit 1
 }
 [[ "${CLOUD_MD5}" == "${CURRENT_MD5}" ]] && {
-	TIME && echo "MD5 对比通过!"
+	TIME y "MD5 对比通过!"
 } || {
-	TIME && echo "MD5 对比失败,请检查网络后重试!"
+	echo -e "\n本地固件MD5: ${CURRENT_MD5}"
+	echo "云端固件MD5: ${CLOUD_MD5}"
+	TIME r "MD5 对比失败,请检查网络后重试!"
 	exit 1
 }
 if [[ "${Compressed_Firmware}" == 1 ]];then
-	TIME && echo "检测到固件为 [.gz] 格式,开始解压固件..."
+	TIME "检测到固件为 [.gz] 格式,开始解压固件..."
 	Install_Pkg gzip
 	gzip -dk ${Firmware} > /dev/null 2>&1
-	Firmware="${Firmware_Name}${BOOT_Type}.img"
+	export Firmware="${Firmware_Name}${BOOT_Type}.img"
 	[ -f "${Firmware}" ] && {
-		TIME && echo "固件解压成功,名称: ${Firmware}"
+		TIME y "固件解压成功,名称: ${Firmware}"
 	} || {
-		TIME && echo "固件解压失败!"
+		TIME r "固件解压失败!"
 		exit 1
 	}
 fi
-TIME && echo -e "固件准备就绪,3s 后开始更新..."
+TIME "固件准备就绪,3s 后开始更新..."
 sleep 3
-TIME && echo "正在更新固件,期间请耐心等待..."
+TIME "正在更新固件,期间请耐心等待..."
 sysupgrade ${Upgrade_Options} ${Firmware}
 [[ $? -ne 0 ]] && {
-	TIME && echo "固件刷写失败,请尝试手动更新固件!"
+	TIME r "固件刷写失败,请尝试手动更新固件!"
 	exit 1
 }