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

fix(脚本): 修复当同时安装trojan和VLESS时导致trojan、伪站无法使用的问题

pull/534/merge
mack-a 2021-06-24 10:14:42 +08:00
parent 78b19250e2
commit dd6f2c0abf
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
install.sh
View File

@ -685,8 +685,8 @@ server {
} }
} }
EOF EOF
elif ! echo "${selectCustomInstallType}" |grep -q 4; then
else
cat <<EOF >>/etc/nginx/conf.d/alone.conf cat <<EOF >>/etc/nginx/conf.d/alone.conf
server { server {
listen 127.0.0.1:31302 http2; listen 127.0.0.1:31302 http2;
@ -1642,7 +1642,7 @@ EOF
if echo "${selectCustomInstallType}" | grep -q 4 || [[ "$1" == "all" ]]; then if echo "${selectCustomInstallType}" | grep -q 4 || [[ "$1" == "all" ]]; then
# 回落trojan-go # 回落trojan-go
fallbacksList='{"dest":31296,"xver":0}' fallbacksList='{"dest":31296,"xver":0},{"alpn":"h2","dest":31302,"xver":0}'
fi fi
# VLESS_WS_TLS # VLESS_WS_TLS
@ -1805,7 +1805,7 @@ EOF
], ],
"decryption": "none", "decryption": "none",
"fallbacks": [ "fallbacks": [
${fallbacksList} ${fallbacksList}
] ]
}, },
"streamSettings": { "streamSettings": {
@ -1870,13 +1870,13 @@ EOF
} }
EOF EOF
fi fi
#
if echo "${selectCustomInstallType}" | grep -q 5 || [[ "$1" == "all" ]];then # if echo "${selectCustomInstallType}" | grep -q 5 || [[ "$1" == "all" ]];then
echo >/dev/null # echo >/dev/null
elif [[ -f "/etc/v2ray-agent/v2ray/conf/02_VLESS_TCP_inbounds.json" ]] && echo "${selectCustomInstallType}" | grep -q 4;then # elif [[ -f "/etc/v2ray-agent/v2ray/conf/02_VLESS_TCP_inbounds.json" ]] && echo "${selectCustomInstallType}" | grep -q 4;then
# "h2", # # "h2",
sed -i '/\"h2\",/d' $(grep "\"h2\"," -rl /etc/v2ray-agent/v2ray/conf/02_VLESS_TCP_inbounds.json) # sed -i '/\"h2\",/d' $(grep "\"h2\"," -rl /etc/v2ray-agent/v2ray/conf/02_VLESS_TCP_inbounds.json)
fi # fi
} }
# 初始化Xray 配置文件 # 初始化Xray 配置文件
@ -2182,12 +2182,12 @@ EOF
] ]
} }
EOF EOF
if echo "${selectCustomInstallType}" | grep -q 5 || [[ "$1" == "all" ]];then # if echo "${selectCustomInstallType}" | grep -q 5 || [[ "$1" == "all" ]];then
echo >/dev/null # echo >/dev/null
elif [[ -f "/etc/v2ray-agent/xray/conf/02_VLESS_TCP_inbounds.json" ]] && echo "${selectCustomInstallType}" | grep -q 4;then # elif [[ -f "/etc/v2ray-agent/xray/conf/02_VLESS_TCP_inbounds.json" ]] && echo "${selectCustomInstallType}" | grep -q 4;then
# "h2", # # "h2",
sed -i '/\"h2\",/d' $(grep "\"h2\"," -rl /etc/v2ray-agent/xray/conf/02_VLESS_TCP_inbounds.json) # sed -i '/\"h2\",/d' $(grep "\"h2\"," -rl /etc/v2ray-agent/xray/conf/02_VLESS_TCP_inbounds.json)
fi # fi
} }
# 初始化Trojan-Go配置 # 初始化Trojan-Go配置
@ -3954,7 +3954,7 @@ menu() {
cd "$HOME" || exit cd "$HOME" || exit
echoContent red "\n==============================================================" echoContent red "\n=============================================================="
echoContent green "作者：mack-a" echoContent green "作者：mack-a"
echoContent green "当前版本：v2.5.7" echoContent green "当前版本：v2.5.8"
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