From d3bfde72c6edcef1bedb014e5a863f910f7658d0 Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@gmail.com>
Date: Mon, 8 Dec 2025 22:09:47 +0800
Subject: [PATCH] =?UTF-8?q?~=E4=BC=98=E5=8C=96mix=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=92=8C?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=B8=8B=E8=BD=BD=20~=E4=BF=AE=E5=A4=8Dcrash?=
 =?UTF-8?q?=20-i=E5=88=9D=E5=A7=8B=E5=8C=96=E6=97=B6=E7=9A=84=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/init.sh  |  6 ++++--
 scripts/start.sh | 25 +++++++++++++------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/scripts/init.sh b/scripts/init.sh
index 9c74b69..c7d5a21 100644
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -213,8 +213,8 @@ fi
 command -v bash >/dev/null 2>&1 && shtype=bash
 [ -x /bin/ash ] && shtype=ash
 for file in start.sh task.sh menu.sh; do
-	sed -i "s|/bin/sh|/bin/$shtype|" ${CRASHDIR}/${file}
-	chmod 755 ${CRASHDIR}/${file}
+	sed -i "s|/bin/sh|/bin/$shtype|" ${CRASHDIR}/${file} 2>/dev/null
+	chmod 755 ${CRASHDIR}/${file} 2>/dev/null
 done
 setconfig versionsh_l $version
 #生成用于执行启动服务的变量文件
@@ -316,6 +316,8 @@ mv -f ${CRASHDIR}/mark ${CRASHDIR}/configs/ShellCrash.cfg 2>/dev/null
 mv -f ${CRASHDIR}/configs/ShellClash.cfg ${CRASHDIR}/configs/ShellCrash.cfg 2>/dev/null
 #数据库改名
 mv -f ${CRASHDIR}/geosite.dat ${CRASHDIR}/GeoSite.dat 2>/dev/null
+mv -f ${CRASHDIR}/ruleset/geosite-cn.srs ${CRASHDIR}/ruleset/cn.srs 2>/dev/null
+mv -f ${CRASHDIR}/ruleset/geosite-cn.mrs ${CRASHDIR}/ruleset/cn.mrs 2>/dev/null
 #数据库移动
 mv -f ${CRASHDIR}/*.srs ${CRASHDIR}/ruleset/ 2>/dev/null
 mv -f ${CRASHDIR}/*.mrs ${CRASHDIR}/ruleset/ 2>/dev/null
diff --git a/scripts/start.sh b/scripts/start.sh
index 95d2895..4c70e21 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -429,7 +429,7 @@ EOF
 			[ "$dns_mod" = "mix" ] && {
 				#插入过滤规则
 				cat >>"$TMPDIR"/dns.yaml <<EOF
-    - "rule-set:geosite-cn"
+    - "rule-set:cn"
 EOF
 			}
 		else
@@ -566,10 +566,10 @@ EOF
 		mv -f "$TMPDIR"/rules.add "$TMPDIR"/rules.yaml
 	}
 	#mix模式生成rule-providers
-	[ "$dns_mod" = "mix" ] && ! grep -q 'geosite-cn:' "$TMPDIR"/rule-providers.yaml && ! grep -q '^rule-providers' "$CRASHDIR"/yamls/others.yaml 2>/dev/null && {
+	[ "$dns_mod" = "mix" ] && ! grep -q 'cn:' "$TMPDIR"/rule-providers.yaml && ! grep -q '^rule-providers' "$CRASHDIR"/yamls/others.yaml 2>/dev/null && {
 		space=$(sed -n "1p" "$TMPDIR"/rule-providers.yaml | grep -oE '^ *')                               #获取空格数
 		[ -z "$space" ] && space='  '
-		echo "${space}geosite-cn: {type: file, behavior: domain, format: mrs, path: ./ruleset/geosite-cn.mrs}" >> "$TMPDIR"/rule-providers.yaml 
+		echo "${space}cn: {type: http, behavior: domain, format: mrs, path: ./ruleset/cn.mrs, url: https://testingcf.jsdelivr.net/gh/juewuy/ShellCrash@dev/bin/geodata/mrs_geosite_cn.mrs}" >> "$TMPDIR"/rule-providers.yaml 
 }
 	#对齐rules中的空格
 	sed -i 's/^ *-/ -/g' "$TMPDIR"/rules.yaml
@@ -700,17 +700,18 @@ EOF
 		[ -n "$fake_ip_filter_domain" ] && fake_ip_filter_domain="{ \"domain\": [$fake_ip_filter_domain], \"server\": \"dns_direct\" },"
 		[ -n "$fake_ip_filter_suffix" ] && fake_ip_filter_suffix="{ \"domain_suffix\": [$fake_ip_filter_suffix], \"server\": \"dns_direct\" },"
 		[ -n "$fake_ip_filter_regex" ] && fake_ip_filter_regex="{ \"domain_regex\": [$fake_ip_filter_regex], \"server\": \"dns_direct\" },"
-		direct_dns="{ \"rule_set\": [\"geosite-cn\"], \"server\": \"dns_direct\" },"
+		direct_dns="{ \"rule_set\": [\"cn\"], \"server\": \"dns_direct\" },"
 		#生成add_rule_set.json
-		[ -z "$(cat "$CRASHDIR"/jsons/*.json | grep -Ei '"tag" *: *"geosite-cn"')" ] && cat >"$TMPDIR"/jsons/add_rule_set.json <<EOF
+		[ -z "$(cat "$CRASHDIR"/jsons/*.json | grep -Ei '"tag" *: *"cn"')" ] && cat >"$TMPDIR"/jsons/add_rule_set.json <<EOF
 {
   "route": {
     "rule_set": [
       {
-        "tag": "geosite-cn",
-        "type": "local",
+        "tag": "cn",
+        "type": "remote",
         "format": "binary",
-        "path": "./ruleset/geosite-cn.srs"
+        "path": "./ruleset/cn.srs",
+        "url": "https://testingcf.jsdelivr.net/gh/juewuy/ShellCrash@dev/bin/geodata/srs_geosite_cn.srs"
       }
     ]
   }
@@ -1835,8 +1836,8 @@ clash_check() { #clash启动前检查
 	[ -n "$(grep -oEi 'geoip' "$CRASHDIR"/yamls/*.yaml)" ] && [ -z "$(grep -oEi 'geoip:|mmdb:' "$CRASHDIR"/yamls/*.yaml)" ] && ckgeo Country.mmdb cn_mini.mmdb
 	#预下载GeoSite数据库并排除存在自定义数据库链接的情况
 	[ -n "$(grep -oEi 'geosite' "$CRASHDIR"/yamls/*.yaml)" ] && [ -z "$(grep -oEi 'geosite:' "$CRASHDIR"/yamls/*.yaml)" ] && ckgeo GeoSite.dat geosite.dat
-	#预下载geosite-cn.mrs数据库
-	[ -n "$(cat "$CRASHDIR"/yamls/*.yaml | grep -oEi 'rule_set.*geosite-cn')" -o "$dns_mod" = "mix" ] && ckgeo ruleset/geosite-cn.mrs mrs_geosite_cn.mrs
+	#预下载cn.mrs数据库
+	[ -n "$(cat "$CRASHDIR"/yamls/*.yaml | grep -oEi 'rule_set.*cn')" -o "$dns_mod" = "mix" ] && ckgeo ruleset/cn.mrs mrs_geosite_cn.mrs
 	return 0
 }
 singbox_check() { #singbox启动前检查
@@ -1845,8 +1846,8 @@ singbox_check() { #singbox启动前检查
 	core_check
 	#预下载geoip-cn.srs数据库
 	[ -n "$(cat "$CRASHDIR"/jsons/*.json | grep -oEi '"rule_set" *: *"geoip-cn"')" ] && ckgeo ruleset/geoip-cn.srs srs_geoip_cn.srs
-	#预下载geosite-cn.srs数据库
-	[ -n "$(cat "$CRASHDIR"/jsons/*.json | grep -oEi '"rule_set" *: *"geosite-cn"')" -o "$dns_mod" = "mix" ] && ckgeo ruleset/geosite-cn.srs srs_geosite_cn.srs
+	#预下载cn.srs数据库
+	[ -n "$(cat "$CRASHDIR"/jsons/*.json | grep -oEi '"rule_set" *: *"cn"')" -o "$dns_mod" = "mix" ] && ckgeo ruleset/cn.srs srs_geosite_cn.srs
 	return 0
 }
 network_check() { #检查是否联网