From 872a84abc1aa59e61a3db9e9e22ce51317ac892b Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@126.com>
Date: Sun, 13 Dec 2020 22:12:52 +0800
Subject: [PATCH] =?UTF-8?q?v1.0.0beta17.8=20~=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E5=AF=B9padavan=E7=B3=BB=E7=BB=9F=E8=AF=BB=E5=8F=96=E5=B1=80?=
 =?UTF-8?q?=E5=9F=9F=E7=BD=91=E8=AE=BE=E5=A4=87=E8=BF=87=E6=BB=A4=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=94=AF=E6=8C=81=20~=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BA=86=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=87=8F=E5=B0=91=E9=97=AA=E5=AD=98?=
 =?UTF-8?q?=E6=B6=88=E8=80=97=20~=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=83=A8?=
 =?UTF-8?q?=E5=88=86mipsle=E8=AE=BE=E5=A4=87=E6=97=A0=E6=B3=95=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E8=AF=86=E5=88=AB=E6=A0=B8=E5=BF=83=E7=9A=84bug=20~?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=83=A8=E5=88=86=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=E8=AE=A2=E9=98=85=E9=93=BE=E6=8E=A5/=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=93=BE=E6=8E=A5=E4=B8=A2=E5=A4=B1=E7=9A=84bug=20~?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=83=A8=E5=88=86=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=E4=BC=9A=E8=BF=9E=E7=BB=AD=E4=B8=8B=E8=BD=BD=E4=B8=A4?=
 =?UTF-8?q?=E6=AC=A1=E6=A0=B8=E5=BF=83=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/clash.sh   | 14 +++++++-------
 scripts/getdate.sh |  1 +
 scripts/start.sh   | 40 +++++++++++++++++++++-------------------
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/scripts/clash.sh b/scripts/clash.sh
index b2bb263..244404a 100644
--- a/scripts/clash.sh
+++ b/scripts/clash.sh
@@ -33,22 +33,22 @@ getconfig(){
 	#dashboard目录位置
 	[ -d $clashdir/ui ] && dbdir=$clashdir/ui && hostdir=":$db_port/ui"
 	[ -d /www/clash ] && dbdir=/www/clash && hostdir=/clash
-	#开机自启相关
+	#开机自启检测
 	if [ -f /etc/rc.common ];then
 		[ -n "$(find /etc/rc.d -name '*clash')" ] && autostart=enable_rc || autostart=disable_rc
-	else
+	elif [ -w /etc/systemd/system -o -w /usr/lib/systemd/system ];then
 		[ -n "$(systemctl is-enabled clash.service 2>&1 | grep enable)" ] && autostart=enable_sys || autostart=disable_sys
 	fi
 	#开机自启描述
-	if [ "$start_old" = "已开启" ];then
-		auto="\033[32m保守模式\033[0m"
-		auto1="代理本机：\033[36m$local_proxy\033[0m"
-	elif [ "$autostart" = "enable_rc" -o "$autostart" = "enable_sys" ]; then
+	if [ "$autostart" = "enable_rc" -o "$autostart" = "enable_sys" ]; then
 		auto="\033[32m已设置开机启动！\033[0m"
 		auto1="\033[36m禁用\033[0mclash开机启动"
-	else
+	elif [ "$autostart" = "disable_rc" -o "$autostart" = "disable_sys" ]; then
 		auto="\033[31m未设置开机启动！\033[0m"
 		auto1="\033[36m允许\033[0mclash开机启动"
+	else
+		auto="\033[32m保守模式\033[0m"
+		auto1="代理本机：\033[36m$local_proxy\033[0m"
 	fi
 	#获取运行模式
 	[ -z "$redir_mod" ] && [ "$USER" = "root" -o "$USER" = "admin" ] && redir_mod=Redir模式
diff --git a/scripts/getdate.sh b/scripts/getdate.sh
index ac14035..40cca58 100644
--- a/scripts/getdate.sh
+++ b/scripts/getdate.sh
@@ -490,6 +490,7 @@ getgeo(){
 		mv -f /tmp/Country.mmdb $bindir/Country.mmdb
 		echo -----------------------------------------------
 		echo -e "\033[32mGeoIP数据库文件下载成功！\033[0m"
+		Geo_v=$GeoIP_v
 		setconfig Geo_v $GeoIP_v
 		setconfig geotype $geotype
 	fi
diff --git a/scripts/start.sh b/scripts/start.sh
index 91826cd..706afc6 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -385,27 +385,29 @@ start_udp(){
 }
 stop_iptables(){
     #重置iptables规则
-	iptables -t nat -D PREROUTING -p tcp -j clash > /dev/null 2>&1
-	iptables -t nat -D PREROUTING -p udp -j clash_dns > /dev/null 2>&1
-	iptables -t nat -D PREROUTING -p tcp -d 8.8.8.8 -j clash_dns > /dev/null 2>&1
-	iptables -t nat -D PREROUTING -p tcp -d 8.8.4.4 -j clash_dns > /dev/null 2>&1
-	iptables -t nat -F clash > /dev/null 2>&1
-	iptables -t nat -X clash > /dev/null 2>&1
-	iptables -t nat -F clash_dns > /dev/null 2>&1
-	iptables -t nat -X clash_dns > /dev/null 2>&1
-	iptables -D FORWARD -o utun -j ACCEPT > /dev/null 2>&1
+	ip rule del fwmark 1 table 100  2> /dev/null
+	ip route del local default dev lo table 100 2> /dev/null
+	iptables -t nat -D PREROUTING -p tcp -j clash 2> /dev/null
+	iptables -t nat -D PREROUTING -p udp -j clash_dns 2> /dev/null
+	iptables -t nat -D PREROUTING -p tcp -d 8.8.8.8 -j clash_dns 2> /dev/null
+	iptables -t nat -D PREROUTING -p tcp -d 8.8.4.4 -j clash_dns 2> /dev/null
+	iptables -t nat -F clash 2> /dev/null
+	iptables -t nat -X clash 2> /dev/null
+	iptables -t nat -F clash_dns 2> /dev/null
+	iptables -t nat -X clash_dns 2> /dev/null
+	iptables -D FORWARD -o utun -j ACCEPT 2> /dev/null
 	#重置udp规则
-	iptables -t mangle -D PREROUTING -p udp -j clash > /dev/null 2>&1
-	iptables -t mangle -F clash > /dev/null 2>&1
-	iptables -t mangle -X clash > /dev/null 2>&1
+	iptables -t mangle -D PREROUTING -p udp -j clash 2> /dev/null
+	iptables -t mangle -F clash 2> /dev/null
+	iptables -t mangle -X clash 2> /dev/null
 	#重置ipv6规则
-	ip6tables -t nat -D PREROUTING -p tcp -j clashv6 > /dev/null 2>&1
-	ip6tables -t nat -D PREROUTING -p udp -j clashv6_dns > /dev/null 2>&1
-	ip6tables -t nat -F clashv6 > /dev/null 2>&1
-	ip6tables -t nat -X clashv6 > /dev/null 2>&1
-	ip6tables -t nat -F clashv6_dns > /dev/null 2>&1
-	ip6tables -t nat -X clashv6_dns > /dev/null 2>&1
-	ip6tables -D FORWARD -o utun -j ACCEPT > /dev/null 2>&1
+	ip6tables -t nat -D PREROUTING -p tcp -j clashv6 2> /dev/null
+	ip6tables -t nat -D PREROUTING -p udp -j clashv6_dns 2> /dev/null
+	ip6tables -t nat -F clashv6 2> /dev/null
+	ip6tables -t nat -X clashv6 2> /dev/null
+	ip6tables -t nat -F clashv6_dns 2> /dev/null
+	ip6tables -t nat -X clashv6_dns 2> /dev/null
+	ip6tables -D FORWARD -o utun -j ACCEPT 2> /dev/null
 }
 #面板配置保存相关
 web_save(){