github
/
v2ray-agent
mirror of https://github.com/mack-a/v2ray-agent
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(脚本): 修复分流查看域名错误判断

pull/1006/head
mack-a 2024-03-20 17:35:10 +08:00
parent 7383310cbe
commit bcdfb89601
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
install.sh
View File

@ -5874,15 +5874,16 @@ ipv6Routing() {
fi fi
fi fi
if [[ -n "${singBoxConfigPath}" ]]; then
if [[ -f "${singBoxConfigPath}IPv6_out_route.json" ]]; then if [[ -f "${singBoxConfigPath}IPv6_out_route.json" ]]; then
echoContent yellow "sing-box" echoContent yellow "sing-box"
jq -r -c '.route.rules[]|select (.outbound=="IPv6_out")' "${singBoxConfigPath}IPv6_out_route.json" | jq -r jq -r -c '.route.rules[]|select (.outbound=="IPv6_out")' "${singBoxConfigPath}IPv6_out_route.json" | jq -r
elif [[ ! -f "${singBoxConfigPath}IPv6_out_route.json" && -f "${singBoxConfigPath}IPv6_out.json" ]]; then elif [[ ! -f "${singBoxConfigPath}IPv6_out_route.json" && -f "${singBoxConfigPath}IPv6_out.json" ]]; then
echoContent yellow "sing-box" echoContent yellow "sing-box"
echoContent green " ---> 已设置IPv6全局分流" echoContent green " ---> 已设置IPv6全局分流"
else else
echoContent yellow " ---> 未安装IPv6分流" echoContent yellow " ---> 未安装IPv6分流"
fi
fi fi
exit 0 exit 0
@ -6287,15 +6288,18 @@ showWireGuardDomain() {
fi fi
# sing-box # sing-box
if [[ -f "${singBoxConfigPath}wireguard_out_${type}_route.json" ]]; then if [[ -n "${singBoxConfigPath}" ]]; then
echoContent yellow "sing-box" if [[ -f "${singBoxConfigPath}wireguard_out_${type}_route.json" ]]; then
jq -r -c '.route.rules[]' "${singBoxConfigPath}wireguard_out_${type}_route.json" | jq -r echoContent yellow "sing-box"
elif [[ ! -f "${singBoxConfigPath}wireguard_out_${type}_route.json" && -f "${singBoxConfigPath}wireguard_out_${type}.json" ]]; then jq -r -c '.route.rules[]' "${singBoxConfigPath}wireguard_out_${type}_route.json" | jq -r
echoContent yellow "sing-box" elif [[ ! -f "${singBoxConfigPath}wireguard_out_${type}_route.json" && -f "${singBoxConfigPath}wireguard_out_${type}.json" ]]; then
echoContent green " ---> 已设置warp ${type}全局分流" echoContent yellow "sing-box"
else echoContent green " ---> 已设置warp ${type}全局分流"
echoContent yellow " ---> 未安装warp ${type}分流" else
echoContent yellow " ---> 未安装warp ${type}分流"
fi
fi fi
} }
# 添加WireGuard分流 # 添加WireGuard分流
@ -8773,7 +8777,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.31" echoContent green "当前版本：v3.2.32"
echoContent green "Github：https://github.com/mack-a/v2ray-agent" echoContent green "Github：https://github.com/mack-a/v2ray-agent"
echoContent green "描述：八合一共存脚本\c" echoContent green "描述：八合一共存脚本\c"
showInstallStatus showInstallStatus