From 1208a2e73d56991b2a929f37ce932d273c0aac5f Mon Sep 17 00:00:00 2001
From: Hyy2001X <1804430051@qq.com>
Date: Tue, 16 Nov 2021 20:24:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20INCLUDE=5FArgon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Scripts/AutoBuild_DiyScript.sh |  3 ++-
 Scripts/AutoBuild_Function.sh  | 32 --------------------------------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/Scripts/AutoBuild_DiyScript.sh b/Scripts/AutoBuild_DiyScript.sh
index 98a8dc4..5d1f57e 100755
--- a/Scripts/AutoBuild_DiyScript.sh
+++ b/Scripts/AutoBuild_DiyScript.sh
@@ -16,7 +16,6 @@ Diy_Core() {
 
 	INCLUDE_AutoBuild_Features=true
 	INCLUDE_DRM_I915=true
-	INCLUDE_Argon=true
 	INCLUDE_Obsolete_PKG_Compatible=false
 }
 
@@ -39,6 +38,8 @@ Firmware-Diy() {
 	case "${OP_Maintainer}/${OP_REPO_NAME}:${OP_BRANCH}" in
 	coolsnowwolf/lede:master)
 		sed -i "s?/bin/login?/usr/libexec/login.sh?g" ${feeds_pkgs}/ttyd/files/ttyd.config
+		AddPackage git lean luci-theme-argon jerrykuku 18.06
+		AddPackage git lean luci-app-argon-config jerrykuku master
 	;;
 	esac
 
diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh
index e3f4fc1..e9b2d75 100755
--- a/Scripts/AutoBuild_Function.sh
+++ b/Scripts/AutoBuild_Function.sh
@@ -176,38 +176,6 @@ EOF
 		;;
 		esac
 	fi
-	[[ ${INCLUDE_Argon} == true ]] && {
-		case "${OP_Maintainer}/${OP_REPO_NAME}:${OP_BRANCH}" in
-		coolsnowwolf/lede:master)
-			AddPackage git lean luci-theme-argon jerrykuku 18.06
-		;;
-		[Ll]ienol/openwrt:main)
-			AddPackage git other luci-theme-argon jerrykuku master
-		;;
-		[Ll]ienol/openwrt:19.07)
-			AddPackage git other luci-theme-argon jerrykuku v2.2.5
-		;;
-		*)
-			[[ ! ${OP_Maintainer}/${OP_REPO_NAME} = immortalwrt/immortalwrt ]] && {
-				case "${OP_BRANCH}" in
-				19.07)
-					AddPackage git other luci-theme-argon jerrykuku v2.2.5
-				;;
-				21.02)
-					AddPackage git other luci-theme-argon jerrykuku master
-				;;
-				18.06)
-					AddPackage git other luci-theme-argon jerrykuku 18.06
-				;;
-				esac
-			} || {
-				ECHO "[${OP_Maintainer}/${OP_REPO_NAME}:${OP_BRANCH}]: Current Source is not supported ..."
-				Argon_Controller=1
-			}
-		;;
-		esac
-		[[ ${Argon_Controller} == 1 ]] && AddPackage git other luci-app-argon-config jerrykuku master
-	}
 	[[ -n ${Before_IP_Address} ]] && Default_LAN_IP="${Before_IP_Address}"
 	[[ -n ${Default_LAN_IP} && ${Default_LAN_IP} =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]] && {
 		Old_IP_Address=$(awk -F '[="]+' '/ipaddr:-/{print $3}' ${base_files}/bin/config_generate | awk 'NR==1')