From 34da250b6db6cd2cb2c652305a4b5d15348218d6 Mon Sep 17 00:00:00 2001
From: Hyy2001X <1804430051@qq.com>
Date: Wed, 11 Aug 2021 00:48:03 +0800
Subject: [PATCH] =?UTF-8?q?V6.5.7=20=E4=BC=98=E5=8C=96=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E3=80=81log=20=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Scripts/AutoUpdate.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Scripts/AutoUpdate.sh b/Scripts/AutoUpdate.sh
index 1278423..8e825de 100755
--- a/Scripts/AutoUpdate.sh
+++ b/Scripts/AutoUpdate.sh
@@ -3,7 +3,7 @@
 # AutoUpdate for Openwrt
 # Dependences: bash wget-ssl/wget/uclient-fetch curl openssl jsonfilter
 
-Version=V6.5.6
+Version=V6.5.7
 
 function TITLE() {
 	clear && echo "Openwrt-AutoUpdate Script by Hyy2001 ${Version}"
@@ -150,7 +150,7 @@ function ECHO() {
 }
 
 function LOGGER() {
-	if [[ ! ${LOGGER_Block} == 1 ]];then
+	if [[ ! $* =~ (-H|--help|-L|--log) ]];then
 		[[ ! -d ${Log_Path} ]] && mkdir -p ${Log_Path}
 		[[ ! -f ${Log_Path}/AutoUpdate.log ]] && touch ${Log_Path}/AutoUpdate.log
 		echo "[$(date "+%Y-%m-%d-%H:%M:%S")] [$$] $*" >> ${Log_Path}/AutoUpdate.log
@@ -194,10 +194,9 @@ function GET_VARIABLE() {
 function LOAD_VARIABLE() {
 	while [[ $1 ]];do
 		[[ -f $1 ]] && {
-			LOGGER "检测到环境变量列表: [$1]"
 			chmod 777 $1
 			source $1
-		}
+		} || LOGGER "未检测到环境变量列表: [$1]"
 		shift
 	done
 	[[ -z ${TARGET_PROFILE} ]] && TARGET_PROFILE="$(jsonfilter -e '@.model.id' < /etc/board.json | tr ',' '_')"
@@ -292,7 +291,7 @@ function UPDATE_SCRIPT() {
 	}
 	if [[ ! -d $1 ]];then
 		mkdir -p $1 2> /dev/null || {
-			ECHO r "脚本存放文件夹 [$1] 创建失败!"
+			ECHO r "脚本存放目录 [$1] 创建失败!"
 			EXIT 1
 		}
 	fi
@@ -377,8 +376,8 @@ function CHECK_TIME() {
 		LOGGER "[CHECK_TIME] 文件: [$1] 距离修改时间小于 $2 分钟!"
 		echo true
 	} || {
+		LOGGER "[CHECK_TIME] 文件: [$1] 验证失败!"
 		RM $1
-		LOGGER "[CHECK_TIME] 文件: [$1] 距离修改时间已经超过 $2 分钟!"
 		echo false
 	}
 }
@@ -699,9 +698,8 @@ function DOWNLOADER() {
 			shift
 			DL_Path="$1"
 			if [[ ! -d ${DL_Path} ]];then
-				LOGGER "创建下载文件夹: [${DL_Path}] ..."
 				mkdir -p ${DL_Path} 2> /dev/null || {
-					ECHO r "下载文件夹 [${DL_Path}] 创建失败!"
+					ECHO r "下载目录 [${DL_Path}] 创建失败!"
 					return 1
 				}
 			fi
@@ -927,8 +925,8 @@ function NETWORK_CHECK() {
 }
 
 function AutoUpdate_Main() {
+	LOGGER "[${COMMAND}] 开始运行"
 	if [[ ! $1 =~ (-H|--help) ]];then
-		LOGGER "[${COMMAND}] 开始运行"
 		[[ ! -f ${Default_Variable} ]] && {
 			ECHO r "脚本运行环境检测失败,无法正常运行脚本!"
 			EXIT 1