From a0da1cd2033586b3e39d7c6461211367fce13157 Mon Sep 17 00:00:00 2001 From: juewuy Date: Mon, 24 Nov 2025 18:15:06 +0800 Subject: [PATCH] =?UTF-8?q?~=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E8=AE=A2?= =?UTF-8?q?=E9=98=85=E9=85=8D=E7=BD=AE=E7=94=A86-2=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98=20~=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dmix=E6=A8=A1=E5=BC=8F=E4=B8=8E=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E7=9A=84bug=20~=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=96=87=E4=BB=B6=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E5=BA=93=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/start.sh | 6 +++--- scripts/webget.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) 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 ;;