From 8d26d2742af50c01ef591d6d6b05b66abe5f7d00 Mon Sep 17 00:00:00 2001
From: Hyy2001X <1804430051@qq.com>
Date: Mon, 8 Mar 2021 19:13:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B8=B8=E7=94=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E5=8F=B7;=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/x86_64.yml   |  6 +++---
 Scripts/AutoBuild_DiyScript.sh |  2 +-
 Scripts/AutoBuild_Function.sh  | 20 ++++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/x86_64.yml b/.github/workflows/x86_64.yml
index f0675f2..f107e54 100644
--- a/.github/workflows/x86_64.yml
+++ b/.github/workflows/x86_64.yml
@@ -72,6 +72,9 @@ jobs:
         sudo timedatectl set-timezone "Asia/Shanghai"
         sudo mkdir -p /workdir
         sudo chown $USER:$GROUPS /workdir
+        echo "Compile_Date=$(date +%Y%m%d)" > $GITHUB_WORKSPACE/Openwrt.info
+        echo "Display_Date=$(date +'%Y/%m/%d')" >> $GITHUB_WORKSPACE/Openwrt.info
+        echo "## $(date +"%Y%m%d")-x86_64" > update_log.txt
 
     - name: Clone Openwrt source code
       run: |
@@ -84,8 +87,6 @@ jobs:
         cd openwrt
         source $GITHUB_WORKSPACE/$DIY_SCRIPT
         source $GITHUB_WORKSPACE/$FUNCTION_SCRIPT && Diy-Part1
-        echo "Compile_Date=$(date +%Y%m%d)" > $GITHUB_WORKSPACE/Openwrt.info
-        echo "Display_Date=$(date +'%Y/%m/%d')" >> $GITHUB_WORKSPACE/Openwrt.info
 
     - name: Update & Install Feeds
       run: |
@@ -121,7 +122,6 @@ jobs:
 
     - name: Run Diy-Part3 Scripts
       run: |
-        echo "## $(date +"%Y%m%d")-x86_64-TEST" > update_log.txt
         cd openwrt
         source $GITHUB_WORKSPACE/$DIY_SCRIPT
         source $GITHUB_WORKSPACE/$FUNCTION_SCRIPT && Diy-Part3
diff --git a/Scripts/AutoBuild_DiyScript.sh b/Scripts/AutoBuild_DiyScript.sh
index df97f7b..849cf34 100755
--- a/Scripts/AutoBuild_DiyScript.sh
+++ b/Scripts/AutoBuild_DiyScript.sh
@@ -10,7 +10,7 @@ Diy_Core() {
 	INCLUDE_AutoUpdate=true
 	INCLUDE_AutoBuild_Tools=true
 	INCLUDE_mt7621_OC1000MHz=true
-	INCLUDE_DRM_I915=true
+	INCLUDE_DRM_I915=false
 
 	INCLUDE_SSR_Plus=true
 	INCLUDE_Passwall=true
diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh
index 62c3972..664d111 100755
--- a/Scripts/AutoBuild_Function.sh
+++ b/Scripts/AutoBuild_Function.sh
@@ -43,11 +43,11 @@ Diy_Part1_Base() {
 	Replace_File Customize/banner package/base-files/files/etc
 	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
+		sed -i 's/143/143,25,5222,6969,1337,2710/' package/lean/helloworld/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
 	fi
 	if [[ "${INCLUDE_HelloWorld}" == "true" ]];then
 		ExtraPackages git lean luci-app-vssr https://github.com/jerrykuku master
-		ExtraPackages git lean lua-maxminddb https://github.com/jerrykuku master
+		ExtraPackages git other lua-maxminddb https://github.com/jerrykuku master
 		PKG_Finder d package xray-core
 		[[ -z "${PKG_RESULT}" ]] && ExtraPackages svn other xray-core https://github.com/fw876/helloworld/trunk
 	fi
@@ -63,13 +63,13 @@ Diy_Part1_Base() {
 		Replace_File Scripts/AutoBuild_Tools.sh package/base-files/files/bin
 	fi
 	if [[ "${INCLUDE_Passwall}" == "true" ]];then
-		ExtraPackages git lienol openwrt-passwall https://github.com/xiaorouji main
+		ExtraPackages git other openwrt-passwall https://github.com/xiaorouji main
 	fi
 	if [[ "${INCLUDE_mt7621_OC1000MHz}" == "true" ]];then
 		Replace_File Customize/102-mt7621-fix-cpu-clk-add-clkdev.patch target/linux/ramips/patches-5.4
 	fi
 	if [[ "${INCLUDE_OAF}" == "true" ]];then
-		echo "Warning: OpenAppFilter may conflict with FLowoffload/SFE !"
+		echo "Warning: OpenAppFilter may conflict with FLowoffload/SFE/Turbo ACC !"
 		ExtraPackages git other OpenAppFilter https://github.com/destan19
 	fi
 }
@@ -112,17 +112,17 @@ Diy_Part2_Base() {
 		sed -i "s?Openwrt?Openwrt ${Openwrt_Version}?g" package/base-files/files/etc/banner
 	fi
 	[[ -z "${Author}" ]] && Author="Unknown"
-	echo "Author: ${Author}"
-	echo "Openwrt Version: ${Openwrt_Version}"
-	echo "Router: ${TARGET_PROFILE}"
-	echo "Github: ${Github_Repo}"
-	echo "Firmware Type: ${Firmware_sfx}"
 	[ -f "$Default_File" ] && sed -i "s?${Lede_Version}?${Lede_Version} Compiled by ${Author} [${Display_Date}]?g" $Default_File
 	echo "${Openwrt_Version}" > ${AutoBuild_Info}
 	echo "${Github_Repo}" >> ${AutoBuild_Info}
 	echo "${TARGET_PROFILE}" >> ${AutoBuild_Info}
 	echo "${Firmware_sfx}" >> ${AutoBuild_Info}
-	
+
+	echo "Author: ${Author}"
+	echo "Openwrt Version: ${Openwrt_Version}"
+	echo "Router: ${TARGET_PROFILE}"
+	echo "Github: ${Github_Repo}"
+	echo "Firmware Type: ${Firmware_sfx}"
 }
 
 Diy_Part3_Base() {