diff --git a/scripts/start.sh b/scripts/start.sh index 4d1e4fb..a76de59 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -61,9 +61,9 @@ getconfig() { #读取配置及全局变量 #自动生成ua [ -z "$user_agent" -o "$user_agent" = "auto" ] && { if [ "$crashcore" = singbox -o "$crashcore" = singboxp ];then - user_agent="sing-box/$core_v" + user_agent="sing-box/singbox/$core_v" elif [ "$crashcore" = meta ];then - user_agent="mihomo/$core_v" + user_agent="clash.meta/mihomo/$core_v" else user_agent="clash" fi @@ -541,7 +541,7 @@ EOF mv -f "$TMPDIR"/rules.add "$TMPDIR"/rules.yaml } #mix模式生成rule-providers - [ "$dns_mod" = "mix" ] && ! grep -q 'geosite-cn:' "$TMPDIR"/rule-providers.yaml && ! grep -q 'rule-providers' "$CRASHDIR"/yamls/others.yaml 2>/dev/null && { + [ "$dns_mod" = "mix" ] && ! grep -q 'geosite-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: geosite-cn.mrs}" >> "$TMPDIR"/rule-providers.yaml diff --git a/scripts/webget.sh b/scripts/webget.sh index 83cde90..9a4d648 100644 --- a/scripts/webget.sh +++ b/scripts/webget.sh @@ -1663,13 +1663,13 @@ setcustgeo(){ #下载自定义数据库文件 ;; 2) project=DustinWin/ruleset_geodata - api_tag=mihomo + api_tag=mihomo-geodata checkcustgeo setcustgeo ;; 3) project=DustinWin/ruleset_geodata - api_tag=sing-box + api_tag=sing-box-geodata checkcustgeo setcustgeo ;;