From 58e1cdf07566d440d4b6db531cbd21089b8d3ec0 Mon Sep 17 00:00:00 2001
From: Hyy2001X <1804430051@qq.com>
Date: Sat, 21 Nov 2020 09:32:06 +0800
Subject: [PATCH] Merge code from BETA Repo

---
 .config               |  3 ++-
 Customize/mwan3       | 23 -----------------------
 Scripts/diy-script.sh | 32 ++++++++++++++++++++------------
 3 files changed, 22 insertions(+), 36 deletions(-)
 delete mode 100644 Customize/mwan3

diff --git a/.config b/.config
index 619f729..c4bdbff 100644
--- a/.config
+++ b/.config
@@ -47,6 +47,7 @@ CONFIG_PACKAGE_luci-app-socat=y
 CONFIG_PACKAGE_luci-app-syncdial=y
 CONFIG_PACKAGE_luci-app-ttyd=y
 CONFIG_PACKAGE_luci-app-unblockmusic=y
+CONFIG_PACKAGE_luci-app-usb-printer=y
 CONFIG_PACKAGE_luci-app-vsftpd=y
 CONFIG_PACKAGE_luci-app-zerotier=y
 CONFIG_PACKAGE_6rd=y
@@ -64,4 +65,4 @@ CONFIG_PACKAGE_wpad=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_xz=y
 CONFIG_PACKAGE_xz-utils=y
-CONFIG_UnblockNeteaseMusic_Go=y
+CONFIG_UnblockNeteaseMusic_Go=y
\ No newline at end of file
diff --git a/Customize/mwan3 b/Customize/mwan3
deleted file mode 100644
index 43574a6..0000000
--- a/Customize/mwan3
+++ /dev/null
@@ -1,23 +0,0 @@
-
-config globals 'globals'
-	option mmx_mask '0x3F00'
-	option rtmon_interval '5'
-
-config member 'wan_m1_w3'
-	option interface 'wan'
-	option metric '1'
-	option weight '3'
-
-config policy 'balanced'
-	option last_resort 'unreachable'
-	list use_member 'wan_m1_w3'
-
-config rule 'https'
-	option sticky '1'
-	option dest_port '443'
-	option proto 'tcp'
-	option use_policy 'balanced'
-
-config rule 'default_rule'
-	option dest_ip '0.0.0.0/0'
-	option use_policy 'balanced'
\ No newline at end of file
diff --git a/Scripts/diy-script.sh b/Scripts/diy-script.sh
index b266b7d..57dfd93 100644
--- a/Scripts/diy-script.sh
+++ b/Scripts/diy-script.sh
@@ -21,7 +21,6 @@ ExtraPackages svn network/services dnsmasq https://github.com/openwrt/openwrt/tr
 ExtraPackages svn network/services hostapd https://github.com/openwrt/openwrt/trunk/package/network/services
 ExtraPackages svn network/services dropbear https://github.com/openwrt/openwrt/trunk/package/network/services
 ExtraPackages svn network/services ppp https://github.com/openwrt/openwrt/trunk/package/network/services
-# ExtraPackages svn network/config firewall https://github.com/openwrt/openwrt/trunk/package/network/config
 # ExtraPackages git kernel mt76 https://github.com/openwrt master
 
 ExtraPackages git lean luci-app-autoupdate https://github.com/Hyy2001X main
@@ -43,7 +42,6 @@ ExtraPackages svn lean luci-app-socat https://github.com/xiaorouji/openwrt-packa
 Diy-Part2() {
 GET_TARGET_INFO
 ExtraPackages svn feeds/packages mwan3 https://github.com/openwrt/packages/trunk/net
-# Replace_File mwan3 package/feeds/packages/mwan3/files/etc/config
 echo "Author: $Author"
 echo "Openwrt Version: $Openwrt_Version"
 echo "AutoUpdate Version: $AutoUpdate_Version"
@@ -103,7 +101,7 @@ do
 		svn checkout $REPO_URL/$PKG_NAME $PKG_NAME > /dev/null 2>&1
 	esac
 	if [ -e $PKG_NAME/Makefile ] || [ -e $PKG_NAME/README* ];then
-		echo "[$(date "+%H:%M:%S")] [Done] Package [$PKG_NAME] is detected!"
+		echo "[$(date "+%H:%M:%S")] Package [$PKG_NAME] is detected!"
 		mv $PKG_NAME package/$PKG_DIR
 		break
 	else
@@ -120,17 +118,27 @@ Replace_File() {
 FILE_NAME=$1
 PATCH_DIR=$GITHUB_WORKSPACE/openwrt/$2
 FILE_RENAME=$3
-[ ! -d $PATCH_DIR ] && mkdir $PATCH_DIR
-if [ -e $GITHUB_WORKSPACE/Customize/$FILE_NAME ];then
-	echo "[$(date "+%H:%M:%S")] Customize File [$FILE_NAME] is detected!"
-	if [ -z $FILE_RENAME ];then
-		[ -e $PATCH_DIR/$FILE_NAME ] && rm -f $PATCH_DIR/$FILE_NAME
-		mv -f $GITHUB_WORKSPACE/Customize/$FILE_NAME $PATCH_DIR/$1
+
+[ ! -d $PATCH_DIR ] && mkdir -p $PATCH_DIR
+if [ -f $GITHUB_WORKSPACE/Customize/$FILE_NAME ];then
+	if [ -e $GITHUB_WORKSPACE/Customize/$FILE_NAME ];then
+		echo "[$(date "+%H:%M:%S")] Customize File [$FILE_NAME] is detected!"
+		if [ -z $FILE_RENAME ];then
+			[ -e $PATCH_DIR/$FILE_NAME ] && rm -f $PATCH_DIR/$FILE_NAME
+			mv -f $GITHUB_WORKSPACE/Customize/$FILE_NAME $PATCH_DIR/$1
+		else
+			[ -e $PATCH_DIR/$FILE_NAME ] && rm -f $PATCH_DIR/$3
+			mv -f $GITHUB_WORKSPACE/Customize/$FILE_NAME $PATCH_DIR/$3
+		fi
 	else
-		[ -e $PATCH_DIR/$FILE_NAME ] && rm -f $PATCH_DIR/$3
-		mv -f $GITHUB_WORKSPACE/Customize/$FILE_NAME $PATCH_DIR/$3
+		echo "[$(date "+%H:%M:%S")] Customize File [$FILE_NAME] is not detected,skip move ..."
 	fi
 else
-	echo "[$(date "+%H:%M:%S")] Customize File [$FILE_NAME] is not detected,skip move ..."
+	if [ -d $GITHUB_WORKSPACE/Customize/$FILE_NAME ];then
+		echo "[$(date "+%H:%M:%S")] Customize Folder [$FILE_NAME] is detected !"
+		mv -f $GITHUB_WORKSPACE/Customize/$FILE_NAME $PATCH_DIR
+	else
+		echo "[$(date "+%H:%M:%S")] Customize Folder [$FILE_NAME] is not detected,skip move ..."
+	fi
 fi
 }