Merge branch 'master' of https://github.com/juewuy/ShellClash into master

# Conflicts:
#	bin/version
This commit is contained in:
juewuy
2023-09-29 18:37:18 +08:00
14 changed files with 18420 additions and 18378 deletions

View File

@@ -346,7 +346,7 @@ store-selected: $restore
$find_process
EOF
#读取本机hosts并生成配置文件
if [ "$hosts_opt" != "未启用" ] && [ -z "$(grep -aE '^hosts:' $clashdir/user.yaml 2>/dev/null)" ];then
if [ "$hosts_opt" != "未启用" ] && [ -z "$(grep -aE '^hosts:' $clashdir/yamls/user.yaml 2>/dev/null)" ];then
#NTP劫持
cat >> $TMPDIR/hosts.yaml <<EOF
hosts: