From 9d8762c482005be65de8734da32ee6379abb1620 Mon Sep 17 00:00:00 2001
From: Hyy2001X <1804430051@qq.com>
Date: Tue, 16 Feb 2021 22:39:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E9=83=A8=E5=88=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=88=B0=20Function.sh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Scripts/AutoBuild_DiyScript.sh |  8 +++-----
 Scripts/AutoBuild_Function.sh  | 14 ++++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Scripts/AutoBuild_DiyScript.sh b/Scripts/AutoBuild_DiyScript.sh
index 9ca4555..a8db187 100644
--- a/Scripts/AutoBuild_DiyScript.sh
+++ b/Scripts/AutoBuild_DiyScript.sh
@@ -22,16 +22,15 @@ Diy_Core() {
 
 Diy-Part1() {
 	Diy_Part1_Base
-	
-	Replace_File Customize/mac80211.sh package/kernel/mac80211/files/lib/wifi
+
 	if [ "${Default_Device}" == "d-team_newifi-d2" ];then
 		Replace_File Customize/system_newifi-d2 package/base-files/files/etc/config system
 	else
 		Replace_File Customize/system_common package/base-files/files/etc/config system
 	fi
-	Replace_File Customize/banner package/base-files/files/etc
-	
+
 	Update_Makefile exfat package/kernel/exfat
+
 	Replace_File Customize/mt76-20210127.mk package/kernel/mt76 Makefile
 	rm -rf package/kernel/mt76/patches
 
@@ -52,7 +51,6 @@ Diy-Part1() {
 
 Diy-Part2() {
 	Diy_Part2_Base
-	Replace_File Customize/mwan3.config package/feeds/packages/mwan3/files/etc/config mwan3
 }
 
 Diy-Part3() {
diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh
index f618ef3..721fb92 100644
--- a/Scripts/AutoBuild_Function.sh
+++ b/Scripts/AutoBuild_Function.sh
@@ -7,7 +7,7 @@ GET_TARGET_INFO() {
 	[ -f ${GITHUB_WORKSPACE}/Openwrt.info ] && . ${GITHUB_WORKSPACE}/Openwrt.info
 	Default_File="package/lean/default-settings/files/zzz-default-settings"
 	[ -f ${Default_File} ] && Lede_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Default_File})"
-	[[ -z ${Lede_Version} ]] && Lede_Version="Openwrt"
+	[[ -z ${Lede_Version} ]] && Lede_Version="Unknown"
 	Openwrt_Version="${Lede_Version}-${Compile_Date}"
 	TARGET_PROFILE="$(egrep -o "CONFIG_TARGET.*DEVICE.*=y" .config | sed -r 's/.*DEVICE_(.*)=y/\1/')"
 	[[ -z "${TARGET_PROFILE}" ]] && TARGET_PROFILE="${Default_Device}"
@@ -19,6 +19,8 @@ GET_TARGET_INFO() {
 Diy_Part1_Base() {
 	Diy_Core
 	Mkdir package/lean
+	[ -f "${GITHUB_WORKSPACE}/Customize/banner" ] && Replace_File Customize/banner package/base-files/files/etc
+	[ -f "${GITHUB_WORKSPACE}/Customize/mac80211.sh" ] && Replace_File Customize/mac80211.sh package/kernel/mac80211/files/lib/wifi
 	if [[ "${INCLUDE_SSR_Plus}" == "true" ]];then
 		ExtraPackages git lean helloworld https://github.com/fw876 master
 		sed -i 's/143/143,25,5222/' package/lean/helloworld/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
@@ -80,6 +82,7 @@ Diy_Part2_Base() {
 	echo "${Openwrt_Version}" > package/base-files/files/etc/openwrt_info
 	echo "${Github_Repo}" >> package/base-files/files/etc/openwrt_info
 	echo "${TARGET_PROFILE}" >> package/base-files/files/etc/openwrt_info
+	[ -f "${GITHUB_WORKSPACE}/Customize/mwan3" ] && Replace_File Customize/mwan3.config package/feeds/packages/mwan3/files/etc/config mwan3
 }
 
 Diy_Part3_Base() {
@@ -123,8 +126,7 @@ ExtraPackages() {
 		git)
 		
 			if [[ -z "${REPO_BRANCH}" ]];then
-				echo "[$(date "+%H:%M:%S")] Missing important options,skip check out..."
-				break
+				REPO_BRANCH="master"
 			fi
 			git clone -b ${REPO_BRANCH} ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1
 		;;
@@ -172,9 +174,9 @@ Replace_File() {
 }
 
 Update_Makefile() {
-	PKG_NAME="$1"
-	Makefile="$2/Makefile"
-	[ -f /tmp/tmp_file ] && rm -f /tmp/tmp_file
+	PKG_NAME=${1}
+	Makefile=${2}/Makefile
+	[ -f "/tmp/tmp_file" ] && rm -f /tmp/tmp_file
 	if [ -f "${Makefile}" ];then
 		PKG_URL_MAIN="$(grep "PKG_SOURCE_URL:=" ${Makefile} | cut -c17-100)"
 		_process1=${PKG_URL_MAIN##*com/}