fix(脚本): 修复xray-core全局分流不生效问题、修复sing-box屏蔽大陆域名后GooglePlay无法下载问题

pull/965/head
mack-a 2024-02-21 15:27:44 +08:00
parent 5ab1a459b9
commit 1aadfa4182
1 changed files with 11 additions and 4 deletions

View File

@ -3248,6 +3248,7 @@ addSingBoxRouteRule() {
} }
} }
EOF EOF
jq 'if .route.rule_set == [] then del(.route.rule_set) else . end' "${singBoxConfigPath}${routingName}.json" >"${singBoxConfigPath}${routingName}_tmp.json" && mv "${singBoxConfigPath}${routingName}_tmp.json" "${singBoxConfigPath}${routingName}.json"
fi fi
} }
@ -5886,7 +5887,7 @@ ipv6Routing() {
if [[ "${coreInstallType}" == "1" ]]; then if [[ "${coreInstallType}" == "1" ]]; then
addXrayOutbound IPv6_out addXrayOutbound IPv6_out
removeXrayOutbound IPv4_out removeXrayOutbound IPv4_out
removeXrayOutbound direct removeXrayOutbound z_direct_outbound
removeXrayOutbound blackhole_out removeXrayOutbound blackhole_out
removeXrayOutbound wireguard_out_IPv4 removeXrayOutbound wireguard_out_IPv4
removeXrayOutbound wireguard_out_IPv6 removeXrayOutbound wireguard_out_IPv6
@ -6062,7 +6063,11 @@ blacklist() {
fi fi
if [[ -n "${singBoxConfigPath}" ]]; then if [[ -n "${singBoxConfigPath}" ]]; then
addSingBoxRouteRule "cn_block_outbound" "cn" "cn_block_route" addSingBoxRouteRule "cn_block_outbound" "cn" "cn_block_route"
addSingBoxRouteRule "01_direct_outbound" "googleapis.com,googleapis.cn,xn--ngstr-lra8j.com,gstatic.com" "cn_01_google_play_route"
addSingBoxOutbound "cn_block_outbound" addSingBoxOutbound "cn_block_outbound"
addSingBoxOutbound "01_direct_outbound" addSingBoxOutbound "01_direct_outbound"
fi fi
@ -6078,6 +6083,8 @@ blacklist() {
removeSingBoxConfig "cn_block_route" removeSingBoxConfig "cn_block_route"
removeSingBoxConfig "cn_block_outbound" removeSingBoxConfig "cn_block_outbound"
removeSingBoxConfig "cn_01_google_play_route"
removeSingBoxConfig "block_domain_route" removeSingBoxConfig "block_domain_route"
removeSingBoxConfig "block_domain_outbound" removeSingBoxConfig "block_domain_outbound"
fi fi
@ -6367,7 +6374,7 @@ warpRoutingReg() {
removeXrayOutbound IPv4_out removeXrayOutbound IPv4_out
removeXrayOutbound IPv6_out removeXrayOutbound IPv6_out
removeXrayOutbound direct removeXrayOutbound z_direct_outbound
removeXrayOutbound blackhole_out removeXrayOutbound blackhole_out
rm ${configPath}09_routing.json >/dev/null 2>&1 rm ${configPath}09_routing.json >/dev/null 2>&1
@ -6608,7 +6615,7 @@ setSocks5OutboundRoutingAll() {
if [[ "${coreInstallType}" == "1" ]]; then if [[ "${coreInstallType}" == "1" ]]; then
removeXrayOutbound IPv4_out removeXrayOutbound IPv4_out
removeXrayOutbound IPv6_out removeXrayOutbound IPv6_out
removeXrayOutbound direct removeXrayOutbound z_direct_outbound
removeXrayOutbound blackhole_out removeXrayOutbound blackhole_out
rm ${configPath}09_routing.json >/dev/null 2>&1 rm ${configPath}09_routing.json >/dev/null 2>&1
@ -8728,7 +8735,7 @@ menu() {
cd "$HOME" || exit cd "$HOME" || exit
echoContent red "\n==============================================================" echoContent red "\n=============================================================="
echoContent green "作者mack-a" echoContent green "作者mack-a"
echoContent green "当前版本v3.2.10" echoContent green "当前版本v3.2.11"
echoContent green "Githubhttps://github.com/mack-a/v2ray-agent" echoContent green "Githubhttps://github.com/mack-a/v2ray-agent"
echoContent green "描述:八合一共存脚本\c" echoContent green "描述:八合一共存脚本\c"
showInstallStatus showInstallStatus