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

feat(脚本): 完善warp、IPv6分流查看域名提示、修复设置全局分流卸载后无法使用问题

pull/1006/head
mack-a 2024-03-20 11:22:51 +08:00
parent deda505c9f
commit f334d533db
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
install.sh
View File

@ -5863,8 +5863,15 @@ ipv6Routing() {
read -r -p "请选择:" ipv6Status read -r -p "请选择:" ipv6Status
if [[ "${ipv6Status}" == "1" ]]; then if [[ "${ipv6Status}" == "1" ]]; then
if [[ "${coreInstallType}" == "1" ]]; then if [[ "${coreInstallType}" == "1" ]]; then
if [[ -f "${configPath}09_routing.json" ]]; then
echoContent yellow "Xray-core：" echoContent yellow "Xray-core："
jq -r -c '.routing.rules[]|select (.outboundTag=="IPv6_out")|.domain' ${configPath}09_routing.json | jq -r jq -r -c '.routing.rules[]|select (.outboundTag=="IPv6_out")|.domain' ${configPath}09_routing.json | jq -r
elif [[ ! -f "${configPath}09_routing.json" && -f "${configPath}IPv6_out.json" ]]; then
echoContent green " ---> 已设置IPv6全局分流"
else
echoContent yellow " ---> 未安装IPv6分流"
fi
fi fi
if [[ -n "${singBoxConfigPath}" ]]; then if [[ -n "${singBoxConfigPath}" ]]; then
@ -5946,6 +5953,7 @@ ipv6Routing() {
if [[ -n "${singBoxConfigPath}" ]]; then if [[ -n "${singBoxConfigPath}" ]]; then
removeSingBoxConfig IPv6_out removeSingBoxConfig IPv6_out
addSingBoxOutbound "01_direct_outbound"
fi fi
echoContent green " ---> IPv6分流卸载成功" echoContent green " ---> IPv6分流卸载成功"
@ -6263,6 +6271,10 @@ showWireGuardDomain() {
if [[ -f "${configPath}09_routing.json" ]]; then if [[ -f "${configPath}09_routing.json" ]]; then
echoContent yellow "Xray-core" echoContent yellow "Xray-core"
jq -r -c '.routing.rules[]|select (.outboundTag=="wireguard_out_'"${type}"'")|.domain' ${configPath}09_routing.json | jq -r jq -r -c '.routing.rules[]|select (.outboundTag=="wireguard_out_'"${type}"'")|.domain' ${configPath}09_routing.json | jq -r
elif [[ ! -f "${configPath}09_routing.json" && -f "${configPath}wireguard_out_${type}.json" ]]; then
echoContent green " ---> 已设置warp ${type}全局分流"
else
echoContent yellow " ---> 未安装warp分流"
fi fi
# sing-box # sing-box
@ -6435,6 +6447,10 @@ warpRoutingReg() {
removeSingBoxConfig "wireguard_out_${type}" removeSingBoxConfig "wireguard_out_${type}"
removeXrayOutbound "wireguard_out_${type}" removeXrayOutbound "wireguard_out_${type}"
addSingBoxOutbound "01_direct_outbound"
addXrayOutbound "z_direct_outbound"
echoContent green " ---> 卸载WARP ${type}分流完毕" echoContent green " ---> 卸载WARP ${type}分流完毕"
else else
echoContent red " ---> 选择错误" echoContent red " ---> 选择错误"
@ -8718,7 +8734,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.29" echoContent green "当前版本：v3.2.30"
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