From 32c5583a31c15857f4cc59ff05327f99fb01fed4 Mon Sep 17 00:00:00 2001 From: Simon Shi <9512067+simonsmh@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:31:43 +0800 Subject: [PATCH 1/3] fix geosite-cn ruleset check don't check for space --- scripts/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start.sh b/scripts/start.sh index e2264a0..76d0d7c 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -592,7 +592,7 @@ EOF if [ -z "$(echo "$core_v" | grep -E '^1\.7.*')" ];then mix_dns="{ \"rule_set\": [\"geosite-cn\"], \"invert\": true, \"server\": \"dns_fakeip\" }," #生成add_rule_set.json - [ -z "$(cat ${CRASHDIR}/jsons/*.json | grep -Ei '\"tag\": \"geosite-cn\"')" ] && cat > ${TMPDIR}/jsons/add_rule_set.json < ${TMPDIR}/jsons/add_rule_set.json < Date: Sun, 11 Feb 2024 22:29:11 +0800 Subject: [PATCH 2/3] Update start.sh --- scripts/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start.sh b/scripts/start.sh index 76d0d7c..34df4f8 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -592,7 +592,7 @@ EOF if [ -z "$(echo "$core_v" | grep -E '^1\.7.*')" ];then mix_dns="{ \"rule_set\": [\"geosite-cn\"], \"invert\": true, \"server\": \"dns_fakeip\" }," #生成add_rule_set.json - [ -z "$(cat ${CRASHDIR}/jsons/*.json | grep -Ei '\"tag\": ?\"geosite-cn\"')" ] && cat > ${TMPDIR}/jsons/add_rule_set.json < ${TMPDIR}/jsons/add_rule_set.json < Date: Mon, 12 Feb 2024 09:58:48 +0800 Subject: [PATCH 3/3] Update start.sh --- scripts/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start.sh b/scripts/start.sh index 34df4f8..f953aac 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -592,7 +592,7 @@ EOF if [ -z "$(echo "$core_v" | grep -E '^1\.7.*')" ];then mix_dns="{ \"rule_set\": [\"geosite-cn\"], \"invert\": true, \"server\": \"dns_fakeip\" }," #生成add_rule_set.json - [ -z "$(cat ${CRASHDIR}/jsons/*.json | grep -Ei '\"tag\"\s*:\s*\"geosite-cn\"')" ] && cat > ${TMPDIR}/jsons/add_rule_set.json < ${TMPDIR}/jsons/add_rule_set.json <