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 </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 <"$TMPDIR"/jsons/add_rule_set.json <