From f5618ef3d805bc28ab3d4b73d45222b4d82b12d0 Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@gmail.com>
Date: Fri, 5 Apr 2024 18:22:33 +0800
Subject: [PATCH] =?UTF-8?q?~=E4=BF=AE=E5=A4=8Ddns=E5=B1=80=E5=9F=9F?=
 =?UTF-8?q?=E7=BD=91=E8=BF=87=E6=BB=A4=E5=A4=B1=E6=95=88=E7=9A=84bug=20~?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B=E5=8C=96=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84bug=20~=E5=B0=9D=E8=AF=95=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=83=A8=E5=88=86=E5=8D=8E=E7=A1=95=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=BC=80=E6=9C=BA=E5=90=AF=E5=8A=A8=E5=A4=B1=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20~=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=B0=8F=E7=B1=B3=E8=AE=BE=E5=A4=87=E5=BC=80?=
 =?UTF-8?q?=E6=9C=BA=E5=90=AF=E5=8A=A8=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh             |  2 +-
 scripts/init.sh        | 19 +++++++++++--------
 scripts/misnap_init.sh |  4 ++--
 scripts/start.sh       |  4 ++--
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/install.sh b/install.sh
index e1fbf17..0f3c1e6 100644
--- a/install.sh
+++ b/install.sh
@@ -121,7 +121,7 @@ if [ -n "$systype" ];then
 	}
 	[ "$systype" = "asusrouter" ] && {
 		$echo "\033[33m检测到当前设备为华硕固件，请选择安装方式\033[0m"	
-		$echo " 1 基于USB设备安装(通用，须插入\033[31m任意\033[0mUSB设备)"
+		$echo " 1 基于USB设备安装(限23年9月之前固件，须插入\033[31m任意\033[0mUSB设备)"
 		$echo " 2 基于自启脚本安装(仅支持梅林及部分官改固件)"
 		$echo " 0 退出安装"
 		echo -----------------------------------------------
diff --git a/scripts/init.sh b/scripts/init.sh
index 6b77088..842389a 100644
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -136,6 +136,9 @@ setconfig(){
 	systype=asusrouter #华硕固件
 	[ -f "/jffs/.asusrouter" ] && initdir='/jffs/.asusrouter'
 	[ -d "/jffs/scripts" ] && initdir='/jffs/scripts/nat-start' 
+	#华硕启用jffs
+	nvram set jffs2_scripts="1"
+	nvram commit
 	}
 [ -f "/data/etc/crontabs/root" ] && systype=mi_snapshot #小米设备
 [ -w "/var/mnt/cfg/firewall" ] && systype=ng_snapshot #NETGEAR设备
@@ -234,18 +237,18 @@ if [ -n "$profile" ];then
 		echo "export CRASHDIR=\"$CRASHDIR\"" >> ~/.zshrc
 		source ~/.zshrc >/dev/null 2>&1
 	}
-	#在允许的情况下创建/usr/bin/crash文件
-	[ -w /usr/bin ] && {
-		cat > /usr/bin/crash <<EOF
-#/bin/$shtype
-$CRASHDIR/menu.sh \$1 \$2 \$3 \$4 \$5
-EOF
-		chmod +x /usr/bin/crash
-	}
 else
 	echo -e "\033[33m无法写入环境变量！请检查安装权限！\033[0m"
 	exit 1
 fi
+#在允许的情况下创建/usr/bin/crash文件
+touch /usr/bin/crash 2>/dev/null && {
+	cat > /usr/bin/crash <<EOF
+#/bin/$shtype
+$CRASHDIR/menu.sh \$1 \$2 \$3 \$4 \$5
+EOF
+	chmod +x /usr/bin/crash
+}
 #梅林/Padavan额外设置
 [ -n "$initdir" ] && {
 	sed -i '/ShellCrash初始化/'d $initdir
diff --git a/scripts/misnap_init.sh b/scripts/misnap_init.sh
index b4ca8ec..3ada5f0 100644
--- a/scripts/misnap_init.sh
+++ b/scripts/misnap_init.sh
@@ -43,10 +43,10 @@ tproxyfix(){
 }
 init(){
 	#等待启动完成
-	log_file=$(uci get system.@system[0].log_file)
-	while ! /sbin/ip a| grep -q lan; do
+	while ! ip a| grep -q lan; do
 		sleep 10
 	done
+	sleep 20
 	#初始化环境变量
 	sed -i "/alias crash/d" $profile
 	sed -i "/alias clash/d" $profile
diff --git a/scripts/start.sh b/scripts/start.sh
index 9bda8d8..9dd9e0e 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -940,12 +940,12 @@ start_ipt_dns(){ #iptables-dns通用工具
 		$1 -t nat -A $3 -p udp -s $bypass_host -j RETURN
 	}
 	#局域网mac地址黑名单过滤
-	[ "$3" = 'PREROUTING' ] && [ -s "$(cat ${CRASHDIR}/configs/mac)" ] && [ "$macfilter_type" != "白名单" ] && {
+	[ "$2" = 'PREROUTING' ] && [ -s ${CRASHDIR}/configs/mac ] && [ "$macfilter_type" != "白名单" ] && {
 		for mac in $(cat ${CRASHDIR}/configs/mac); do
 			$1 -t nat -A $3 -m mac --mac-source $mac -j RETURN
 		done
 	}	
-	if [ "$3" = 'PREROUTING' ] && [ "$macfilter_type" = "白名单" ] && [ -n "$(cat ${CRASHDIR}/configs/mac)" ];then
+	if [ "$2" = 'PREROUTING' ] && [ -s ${CRASHDIR}/configs/mac ] && [ "$macfilter_type" = "白名单" ];then
 		for mac in $(cat ${CRASHDIR}/configs/mac); do
 			$1 -t nat -A $3 -p tcp -m mac --mac-source $mac -j REDIRECT --to-ports $dns_port
 			$1 -t nat -A $3 -p udp -m mac --mac-source $mac -j REDIRECT --to-ports $dns_port