From d39c95394f0c01a13812b283d709355b165b7b34 Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@gmail.com>
Date: Sun, 8 Dec 2024 15:51:39 +0800
Subject: [PATCH] =?UTF-8?q?~=E8=B0=83=E6=95=B4meta=E5=86=85=E6=A0=B8mix?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E8=BF=87=E6=BB=A4=E5=AE=9E=E7=8E=B0(geosite>?=
 =?UTF-8?q?rule-set=E6=95=B0=E6=8D=AE=E5=BA=93)=20~=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=AE=8C=E6=95=B4=E7=89=88clash-geoip=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E6=9B=B4=E6=96=B0=20~=E4=BC=98=E5=8C=96dns=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/menu.sh   |  6 +++---
 scripts/webget.sh | 33 ++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/scripts/menu.sh b/scripts/menu.sh
index e87050f..87c997b 100644
--- a/scripts/menu.sh
+++ b/scripts/menu.sh
@@ -1436,10 +1436,10 @@ set_dns_mod() { #DNS模式设置
 	echo -e "\033[33m切换模式后需要手动重启服务以生效！\033[0m"
 	echo -----------------------------------------------
 	echo -e " 1 fake-ip模式：   \033[32m响应速度更快\033[0m"
-	echo -e "                   不支持绕过CN-IP功能"
+	echo -e "                   不支持CN-IP绕过功能"
+	echo -e " 2 redir_host模式：\033[32m兼容性更好\033[0m"
+	echo -e "                   需搭配加密DNS使用"
 	if [ "$crashcore" = singbox ] || [ "$crashcore" = singboxp ] || [ "$crashcore" = meta ]; then
-		echo -e " 2 redir_host模式：\033[32m兼容性更好\033[0m"
-		echo -e "                   需搭配加密DNS使用"
 		echo -e " 3 mix混合模式：   \033[32m内部realip外部fakeip\033[0m"
 		echo -e "                   依赖geosite.dat/geosite-cn.srs数据库"
 	fi
diff --git a/scripts/webget.sh b/scripts/webget.sh
index 3247395..1bfa664 100644
--- a/scripts/webget.sh
+++ b/scripts/webget.sh
@@ -1245,22 +1245,25 @@ switch_core(){ #clash与singbox内核切换
 	#singbox和clash内核切换时提示是否保留文件
 	[ "$core_new" != "$core_old" ] && {
 		[ "$dns_mod" = "redir_host" ] && [ "$core_old" = "clash" ] && setconfig dns_mod mix #singbox自动切换dns
-		[ "$dns_mod" = "mix" ] && [ "$core_old" = "singbox" ] && setconfig dns_mod fake-ip #singbox自动切换dns
+		[ "$dns_mod" = "mix" ] && [ "$crashcore" = 'clash' -o "$crashcore" = 'clashpre' ] && setconfig dns_mod fake-ip #singbox自动切换dns
 		echo -e "\033[33m已从$core_old内核切换至$core_new内核\033[0m"
 		echo -e "\033[33m二者Geo数据库及yaml/json配置文件不通用\033[0m"
 		read -p "是否保留相关数据库文件？(1/0) > " res
-		[ "$res" = '0' ] && [ "$core_old" = "clash" ] && {
-			 rm -rf ${CRASHDIR}/Country.mmdb
-			 rm -rf ${CRASHDIR}/GeoSite.dat
-			 setconfig Country_v
-			 setconfig cn_mini_v
-			 setconfig geosite_v
-		}
-		[ "$res" = '0' ] && [ "$core_old" = "singbox" ] && {
-			 rm -rf ${CRASHDIR}/geoip.db
-			 rm -rf ${CRASHDIR}/geosite.db
-			 setconfig geoip_cn_v
-			 setconfig geosite_cn_v
+		[ "$res" = '0' ] && {
+			[ "$core_old" = "clash" ] && {
+				geodate='Country.mmdb GeoSite.dat geosite-cn.mrs'
+				geodate_v='Country_v cn_mini_v geosite_v mrs_geosite_cn_v'
+			}
+			[ "$core_old" = "singbox" ] && {
+				geodate='geoip.db geosite.db geoip-cn.srs geosite-cn.srs'
+				geodate_v='geoip_cn_v geosite_cn_v srs_geoip_cn_v srs_geosite_cn_v'
+			}
+			for text in ${geodate} ;do
+				rm -rf ${CRASHDIR}/"$text"
+			done
+			for text in ${geodate_v} ;do
+				setconfig "$text"
+			done
 		}
 	}
 	if [ "$crashcore" = singbox -o "$crashcore" = singboxp ];then
@@ -1771,10 +1774,10 @@ setgeo(){ #数据库选择菜单
 		echo -----------------------------------------------
 		read -p "确认清理？[1/0] > " res
 		[ "$res" = '1' ] && {
-			for file in cn_ip.txt cn_ipv6.txt Country.mmdb GeoSite.dat geoip.db geosite.db ;do
+			for file in cn_ip.txt cn_ipv6.txt Country.mmdb GeoSite.dat geosite_cn.mrs geoip.db geosite.db geoip-cn.srs geosite-cn.srs;do
 				rm -rf $CRASHDIR/$file
 			done
-			for var in Country_v cn_mini_v china_ip_list_v china_ipv6_list_v geosite_v geoip_cn_v geosite_cn_v ;do
+			for var in Country_v cn_mini_v china_ip_list_v china_ipv6_list_v geosite_v geoip_cn_v geosite_cn_v mrs_geosite_cn_v srs_geoip_cn_v srs_geosite_cn_v ;do
 				setconfig $var
 			done
 			rm -rf $CRASHDIR/*.srs