From 5a1e4a6bacab630c7a78b82f03533328f44c9613 Mon Sep 17 00:00:00 2001
From: Hyy2001X <1804430051@qq.com>
Date: Sun, 27 Jun 2021 11:52:06 +0800
Subject: [PATCH] =?UTF-8?q?AddPackage=20=E8=B7=B3=E8=BF=87=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=9B=B8=E5=90=8C=E6=BA=90=E7=A0=81=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E7=9A=84=E8=BD=AF=E4=BB=B6=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Scripts/AutoBuild_Function.sh | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh
index 407b71d..e7c85e0 100755
--- a/Scripts/AutoBuild_Function.sh
+++ b/Scripts/AutoBuild_Function.sh
@@ -201,12 +201,6 @@ Firmware-Diy_Base() {
 			if [[ ! ${Default_LAN_IP} == ${Old_IP_Address} ]];then
 				TIME "Setting default IP Address to ${Default_LAN_IP} ..."
 				sed -i "s/${Old_IP_Address}/${Default_LAN_IP}/g" package/base-files/files/bin/config_generate
-				# a=$(echo ${Old_IP_Address} | egrep -o "[0-9]+.[0-9]+." | awk 'NR==1')
-				# b=$(echo ${Default_LAN_IP} | egrep -o "[0-9]+.[0-9]+." | awk 'NR==1')
-				# c="$(egrep -o ")).[0-9]+" package/base-files/files/bin/config_generate)"
-				# d=")).$(echo ${Default_LAN_IP} | egrep -o "[0-9]+" | awk 'END {print}')"
-				# sed -i "s/${a}/${b}/g" package/base-files/files/bin/config_generate
-				# sed -i "s/${c}/${d}/g" package/base-files/files/bin/config_generate
 			fi
 		else
 			TIME "[ERROR] ${Default_LAN_IP} is not an IP Address !"
@@ -385,7 +379,7 @@ AddPackage_List() {
 	[[ -s $1 ]] && {
 		TIME "Loading Custom Packages list: [$1]..."
 		cat $1 | sed '/^$/d' | while read X;do
-			[[ -n ${X} && ! $* =~ "#" ]] && AddPackage ${X}
+			[[ -n ${X} && ! $* =~ '#' ]] && AddPackage ${X}
 		done
 	}
 }
@@ -401,6 +395,7 @@ AddPackage() {
 	PKG_NAME="$3"
 	REPO_URL="https://github.com/$4"
 	[[ -z $5 ]] && REPO_BRANCH=master || REPO_BRANCH="$5"
+	[[ ${REPO_URL} =~ "${Openwrt_Author}/${Openwrt_Repo_Name}" ]] && return 0
 
 	mkdir -p package/${PKG_DIR}
 	[[ -d package/${PKG_DIR}/${PKG_NAME} ]] && {
@@ -418,7 +413,7 @@ AddPackage() {
 		svn checkout ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1
 	;;
 	esac
-	[[ -f ${PKG_NAME}/Makefile || -f ${PKG_NAME}/README* || -n $(ls -A ${PKG_NAME}) ]] && {
+	[[ -f ${PKG_NAME}/Makefile || -n $(ls -A ${PKG_NAME}) ]] && {
 		mv -f "${PKG_NAME}" "package/${PKG_DIR}"
 	}
 }