From 7164dfcc54b0e744b1827ea0c88f287efdeb02d8 Mon Sep 17 00:00:00 2001
From: Hyy2001X <1804430051@qq.com>
Date: Thu, 4 Mar 2021 11:48:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Scripts/AutoBuild_Function.sh | 58 +++++++++++++----------------------
 1 file changed, 21 insertions(+), 37 deletions(-)

diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh
index 2f297aa..f78cf71 100755
--- a/Scripts/AutoBuild_Function.sh
+++ b/Scripts/AutoBuild_Function.sh
@@ -20,7 +20,7 @@ GET_TARGET_INFO() {
 	[[ -z "${TARGET_PROFILE}" ]] && TARGET_PROFILE="${Default_Device}"
 	case "${TARGET_PROFILE}" in
 	x86_64)
-		grep "CONFIG_TARGET_IMAGES_GZIP=y" ${Home}/.config
+		grep "CONFIG_TARGET_IMAGES_GZIP=y" ${Home}/.config > /dev/null 2>&1
 		if [[ ! $? -ne 0 ]];then
 			Firmware_sfx="img.gz"
 		else
@@ -74,7 +74,6 @@ Diy_Part1_Base() {
 	fi
 	Update_Makefile xray-core package/lean/helloworld/xray-core
 	Update_Makefile exfat package/kernel/exfat
-	# ExtraPackages svn kernel mt76 https://github.com/openwrt/openwrt/trunk/package/kernel
 }
 
 Diy_Part2_Base() {
@@ -200,38 +199,23 @@ ExtraPackages() {
 		rm -rf package/${PKG_DIR}/${PKG_NAME}
 	fi
 	[ -d "${PKG_NAME}" ] && rm -rf ${PKG_NAME}
-	Retry_Times=3
-	while [ ! -f "${PKG_NAME}/Makefile" ]
-	do
-		echo "[$(date "+%H:%M:%S")] Checking out package [${PKG_NAME}] to package/${PKG_DIR} ..."
-		case "${PKG_PROTO}" in
-		git)
-		
-			if [[ -z "${REPO_BRANCH}" ]];then
-				REPO_BRANCH="master"
-			fi
-			git clone -b ${REPO_BRANCH} ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1
-		;;
-		svn)
-			svn checkout ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1
-		;;
-		*)
-			echo "[$(date "+%H:%M:%S")] Wrong option: ${PKG_PROTO} (Can only use git and svn),skip check out..."
-			break
-		;;
-		esac
-		if [ "$?" -eq 0 ] || [ -f ${PKG_NAME}/Makefile ] || [ -f ${PKG_NAME}/README* ] || [ ! "$(ls -A ${PKG_NAME})" = "" ];then
-			echo "[$(date "+%H:%M:%S")] Package [${PKG_NAME}] is detected!"
-			mv -f ${PKG_NAME} package/${PKG_DIR}
-			break
-		else
-			[ ${Retry_Times} -lt 1 ] && echo "[$(date "+%H:%M:%S")] Skip check out package [${PKG_NAME}] ..." && break
-			echo "[$(date "+%H:%M:%S")] [Error] [${Retry_Times}] Checkout failed,retry in 3s ..."
-			Retry_Times=$(($Retry_Times - 1))
-			rm -rf ${PKG_NAME}
-			sleep 3
-		fi
-	done
+	echo "[$(date "+%H:%M:%S")] Checking out package [${PKG_NAME}] to package/${PKG_DIR} ..."
+	case "${PKG_PROTO}" in
+	git)
+		[[ -z "${REPO_BRANCH}" ]] && REPO_BRANCH=master
+		git clone -b ${REPO_BRANCH} ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1
+	;;
+	svn)
+		svn checkout ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1
+	;;
+	*)
+		echo "[$(date "+%H:%M:%S")] Error option: ${PKG_PROTO} !" && return
+	;;
+	esac
+	if [ -f ${PKG_NAME}/Makefile ] || [ -f ${PKG_NAME}/README* ] || [ ! "$(ls -A ${PKG_NAME})" = "" ];then
+		echo "[$(date "+%H:%M:%S")] Package [${PKG_NAME}] is detected!"
+		mv -f ${PKG_NAME} package/${PKG_DIR}
+	fi
 	unset PKG_PROTO PKG_DIR PKG_NAME REPO_URL REPO_BRANCH
 }
 
@@ -240,10 +224,10 @@ Replace_File() {
 	PATCH_DIR=${GITHUB_WORKSPACE}/openwrt/${2}
 	FILE_RENAME=${3}
 	
-	Mkdir "${PATCH_DIR}"
+	Mkdir ${PATCH_DIR}
 	[ -f "${GITHUB_WORKSPACE}/${FILE_NAME}" ] && _TYPE1="f" && _TYPE2="File"
 	[ -d "${GITHUB_WORKSPACE}/${FILE_NAME}" ] && _TYPE1="d" && _TYPE2="Folder"
-	if [ -e "${GITHUB_WORKSPACE}/${FILE_NAME}" ];then
+	if [ -f "${GITHUB_WORKSPACE}/${FILE_NAME}" ];then
 		[[ ! -z "${FILE_RENAME}" ]] && _RENAME="${FILE_RENAME}" || _RENAME=""
 		if [ -${_TYPE1} "${GITHUB_WORKSPACE}/${FILE_NAME}" ];then
 			echo "[$(date "+%H:%M:%S")] Moving [${_TYPE2}] ${FILE_NAME} to ${2}/${FILE_RENAME} ..."
@@ -252,7 +236,7 @@ Replace_File() {
 			echo "[$(date "+%H:%M:%S")] Customize ${_TYPE2} [${FILE_NAME}] is not detected,skip move ..."
 		fi
 	fi
-	unset FILE_NAME PATCH_DIR FILE_RENAME _RENAME _TYPE1 _TYPE2
+	unset FILE_NAME PATCH_DIR FILE_RENAME
 }
 
 Update_Makefile() {