From b3a72ad3762aaed55ce56cf96e4d0011037c7256 Mon Sep 17 00:00:00 2001
From: Hyy2001X <1804430051@qq.com>
Date: Sat, 14 Aug 2021 11:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=85=B3=20Load=5FC?=
 =?UTF-8?q?ommon=5FConfig?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Scripts/AutoBuild_DiyScript.sh |  1 +
 Scripts/AutoBuild_Function.sh  | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Scripts/AutoBuild_DiyScript.sh b/Scripts/AutoBuild_DiyScript.sh
index 1e8c383..3c66b32 100755
--- a/Scripts/AutoBuild_DiyScript.sh
+++ b/Scripts/AutoBuild_DiyScript.sh
@@ -8,6 +8,7 @@ Diy_Core() {
 	Banner_Title="Powered by AutoBuild-Actions"
 	Default_LAN_IP=192.168.1.1
 
+	Load_Common_Config=true
 	Load_CustomPackages_List=true
 	Short_Firmware_Date=true
 	Checkout_Virtual_Images=false
diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh
index a006fca..8ddceda 100755
--- a/Scripts/AutoBuild_Function.sh
+++ b/Scripts/AutoBuild_Function.sh
@@ -82,6 +82,7 @@ OP_REPO_NAME=${OP_REPO_NAME}
 EOF
 	cat >> ${Home}/VARIABLE_FILE <<EOF
 Home=${Home}
+Load_Common_Config=${Load_Common_Config}
 PKG_Compatible="${INCLUDE_Obsolete_PKG_Compatible}"
 Checkout_Virtual_Images="${Checkout_Virtual_Images}"
 Firmware_Path=${Home}/bin/targets/${TARGET_BOARD}/${TARGET_SUBTARGET}
@@ -248,13 +249,12 @@ Firmware-Diy_Other() {
 			ECHO "[${OP_Maintainer}]: Current Source_Maintainer is not supported ..."
 		fi
 	fi
-	if [[ -s $GITHUB_WORKSPACE/Configs/Common ]];then
-		[[ ! "$(cat .config)" =~ "## TEST" ]] && {
+	if [[ ${Load_Common_Config} == true ]];then
+		if [[ -s $GITHUB_WORKSPACE/Configs/Common || ! "$(cat .config)" =~ "## TEST" ]];then
 			ECHO "Merging [Configs/Common] to .config ..."
 			echo -e "\n$(cat $GITHUB_WORKSPACE/Configs/Common)" >> .config
-		} || {
-			sed -i '/## TEST/d' .config >/dev/null 2>&1
-		}
+		fi
+		sed -i '/## TEST/d' .config >/dev/null 2>&1
 	fi
 	ECHO "[Firmware-Diy_Other] Done."
 }
@@ -279,7 +279,7 @@ Firmware-Diy_End() {
 		Process_Firmware ${Firmware_Format}
 	;;
 	esac
-	[[ $(ls) =~ 'AutoBuild-' ]] && mv -f AutoBuild-* ${Home}/bin/Firmware
+	[[ $(ls) =~ 'AutoBuild-' ]] && cp -a AutoBuild-* ${Home}/bin/Firmware
 	cd -
 	echo "[$(date "+%H:%M:%S")] Actions Avaliable: $(df -h | grep "/dev/root" | awk '{printf $4}')"
 	ECHO "[Firmware-Diy_End] Done."