From 5adb662ecebf0c94545ab97f75a5126ad7d05011 Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@126.com>
Date: Tue, 8 Dec 2020 23:21:50 +0800
Subject: [PATCH] =?UTF-8?q?v1.0.0beta17.3=20~=E6=96=B0=E5=A2=9E=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E9=BB=98=E8=AE=A4=E8=BF=87=E6=BB=A4=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E5=8A=9F=E8=83=BD=20~=E5=B1=8F=E8=94=BD=E5=B7=B2?=
 =?UTF-8?q?=E8=A2=AB=E5=B0=81=E7=A6=81=E7=9A=84gitee=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E6=BA=90=20~=E4=BF=AE=E5=A4=8D=E6=96=B0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=90=AF=E5=8A=A8=E6=96=B0?=
 =?UTF-8?q?=E6=89=8B=E5=BC=95=E5=AF=BC=E7=9A=84bug=20~=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E8=AE=BE=E5=A4=87=E9=87=8D=E5=90=AF=E5=90=8E?=
 =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=A4=B1=E6=95=88=E7=9A=84bug=20~=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=81=B6=E5=B0=94=E6=A3=80=E6=B5=8B=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=87=BA=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/clash.sh |  2 +-
 scripts/start.sh | 22 ++++++++--------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/scripts/clash.sh b/scripts/clash.sh
index f2ec314..f1d1a6c 100644
--- a/scripts/clash.sh
+++ b/scripts/clash.sh
@@ -79,7 +79,7 @@ getconfig(){
 	#检查新手引导
 	if [ -z "$userguide" ];then
 		sed -i "1i\userguide=1" $ccfg
-		[ "$res" = 1 ] && source $clashdir/getdate.sh && userguide
+		source $clashdir/getdate.sh && userguide
 	fi
 	#检查执行权限
 	[ ! -x $clashdir/start.sh ] && chmod +x $clashdir/start.sh
diff --git a/scripts/start.sh b/scripts/start.sh
index db68d15..f43017e 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -4,14 +4,14 @@
 #脚本内部工具
 getconfig(){
 	#加载配置文件
-	[ -z "$clashdir" ] && source /etc/profile > /dev/null
-	[ -z "$clashdir" ] && source ~/.bashrc > /dev/null
+	[ -z "$clashdir" ] && clashdir=$(cat /etc/profile | grep clashdir | awk -F "\"" '{print $2}')
+	[ -z "$clashdir" ] && clashdir=$(cat ~/.bashrc | grep clashdir | awk -F "\"" '{print $2}')
 	ccfg=$clashdir/mark
 	[ -f $ccfg ] && source $ccfg
 	#默认设置
 	[ -z "$bindir" ] && bindir=$clashdir
 	[ -z "$redir_mod" ] && [ "$USER" = "root" -o "$USER" = "admin" ] && redir_mod=Redir模式
-	[ -z "$redir_mod" ] && redir_mod=纯净模式
+	[ -z "$redir_mod" ] && redir_mod=Redir模式
 	[ -z "$skip_cert" ] && skip_cert=已开启
 	[ -z "$common_ports" ] && common_ports=已开启
 	[ -z "$dns_mod" ] && dns_mod=redir_host
@@ -531,21 +531,15 @@ bfstart(){
 	fi
 }
 afstart(){
-	set_iptables(){
-		#设置循环检测iptables服务
-		i=1
-		while [ $i -lt 10 ];do
-			[ -n "$(iptables -L)" ] && i=10 || sleep 1
-		done
-		[ "$redir_mod" != "纯净模式" ] && [ "$dns_no" != "已禁用" ] && start_dns
-		[ "$redir_mod" != "纯净模式" ] && [ "$redir_mod" != "Tun模式" ] && start_redir
-		[ "$redir_mod" = "Redir模式" ] && [ "$tproxy_mod" = "已开启" ] && start_udp
-	}
+
 	#读取配置文件
 	getconfig
 	$bindir/clash -t -d $bindir >/dev/null
 	if [ "$?" = 0 ];then
-		set_iptables & #后台检测及设置iptables
+		#设置iptables转发规则
+		[ "$redir_mod" != "纯净模式" ] && [ "$dns_no" != "已禁用" ] && start_dns
+		[ "$redir_mod" != "纯净模式" ] && [ "$redir_mod" != "Tun模式" ] && start_redir
+		[ "$redir_mod" = "Redir模式" ] && [ "$tproxy_mod" = "已开启" ] && start_udp
 		#标记启动时间
 		mark_time
 		#设置本机代理