Skip to content

Place rule-providers before dns in merged config #1290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
baiuu wants to merge 1 commit into
base: dev
Choose a base branch
from
+4 −2
Open

Place rule-providers before dns in merged config #1290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions scripts/starts/clash_modify.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,14 +223,16 @@ merger_yaml() {
[ -s "$TMPDIR"/hosts.yaml ] && yaml_hosts="$TMPDIR"/hosts.yaml
[ -s "$CRASHDIR"/yamls/others.yaml ] && yaml_others="$CRASHDIR"/yamls/others.yaml
yaml_add=
yaml_ruleproviders=
for char in $yaml_char; do #将额外配置文件合并
[ -s "$TMPDIR"/${char}.yaml ] && {
sed -i "1i\\${char}:" "$TMPDIR"/${char}.yaml
yaml_add="$yaml_add $TMPDIR/${char}.yaml"
[ "$char" = "rule-providers" ] && yaml_ruleproviders="$TMPDIR/${char}.yaml" || yaml_add="$yaml_add $TMPDIR/${char}.yaml"
}
done
#合并完整配置文件
cut -c 1- "$TMPDIR"/set.yaml $yaml_dns $yaml_hosts $yaml_user $yaml_others $yaml_add >"$TMPDIR"/config.yaml
#合并完整配置文件, rule-providers 必须位于 dns 之前以确保 rule-set 引用可解析
cut -c 1- "$TMPDIR"/set.yaml $yaml_ruleproviders $yaml_dns $yaml_hosts $yaml_user $yaml_others $yaml_add >"$TMPDIR"/config.yaml
}

test_yaml() {
Expand Down