diff --git a/ShellCrash.tar.gz b/ShellCrash.tar.gz index 5f3551a9..10fd930d 100644 Binary files a/ShellCrash.tar.gz and b/ShellCrash.tar.gz differ diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 5f3551a9..10fd930d 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/version b/bin/version index 7a29ad88..bd91fc1a 100644 --- a/bin/version +++ b/bin/version @@ -1,4 +1,4 @@ meta_v=v1.19.17 singboxr_v=1.13.0-alpha.27 -versionsh=1.9.3beta7 +versionsh=1.9.3beta7fix GeoIP_v=20251205 diff --git a/scripts/init.sh b/scripts/init.sh index b7633ea5..72d96985 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy -version=1.9.3beta7 +version=1.9.3beta7fix setdir() { dir_avail() { diff --git a/scripts/start.sh b/scripts/start.sh index a24da069..6b7d96c2 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -574,7 +574,7 @@ EOF mv -f "$TMPDIR"/rules.add "$TMPDIR"/rules.yaml } #mix模式生成rule-providers - [ "$dns_mod" = "mix" ] && ! grep -q ' 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}cn: {type: http, behavior: domain, format: mrs, path: ./ruleset/cn.mrs, url: https://testingcf.jsdelivr.net/gh/juewuy/ShellCrash@update/bin/geodata/mrs_geosite_cn.mrs}" >> "$TMPDIR"/rule-providers.yaml @@ -705,7 +705,7 @@ EOF [ -n "$fake_ip_filter_regex" ] && fake_ip_filter_regex="{ \"domain_regex\": [$fake_ip_filter_regex], \"server\": \"dns_direct\" }," proxy_dns='{ "query_type": ["A", "AAAA"], "server": "dns_fakeip", "strategy": "'"$strategy"'", "rewrite_ttl": 1 }' #mix模式插入fakeip过滤规则 - [ "$dns_mod" = "mix" ] && direct_dns='{ "rule_set": ["cn"], "server": "dns_direct" }' + [ "$dns_mod" = "mix" ] && direct_dns='{ "rule_set": ["cn"], "server": "dns_direct" },' } [ "$dns_mod" = "route" ] && { global_dns=dns_proxy diff --git a/version b/version index 1047f6bf..9b5af72f 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.9.3beta7 +1.9.3beta7fix