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

fix(脚本): 修复VMess端口无法识别问题、修复naive报错问题

pull/909/head^2
mack-a 2024-01-07 12:02:44 +08:00
parent 09b066bacf
commit de3a3e0e2f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
install.sh
View File

@ -4665,10 +4665,15 @@ showAccounts() {
echoContent skyBlue "\n ---> 账号:${email}" echoContent skyBlue "\n ---> 账号:${email}"
echo echo
local vmessPort=${currentDefaultPort}
if [[ "${coreInstallType}" == "2" ]]; then
vmessPort="${singBoxVMessWSPort}"
fi
local count= local count=
while read -r line; do while read -r line; do
if [[ -n "${line}" ]]; then if [[ -n "${line}" ]]; then
defaultBase64Code vmessws "${singBoxVMessWSPort}" "${email}${count}" "$(echo "${user}" | jq -r .id//.uuid)" "${line}" "${path}" defaultBase64Code vmessws "${vmessPort}" "${email}${count}" "$(echo "${user}" | jq -r .id//.uuid)" "${line}" "${path}"
count=$((count + 1)) count=$((count + 1))
fi fi
done < <(echo "${currentAdd}" | tr ',' '\n') done < <(echo "${currentAdd}" | tr ',' '\n')
@ -4760,7 +4765,7 @@ showAccounts() {
fi fi
# naive # naive
if echo ${currentInstallProtocolType} | grep -q ",10," || [[ -n "${tuicPort}" ]]; then if echo ${currentInstallProtocolType} | grep -q ",10," || [[ -n "${singBoxNaivePort}" ]]; then
echoContent skyBlue "\n================================ naive TLS [推荐，不支持ClashMeta] ================================\n" echoContent skyBlue "\n================================ naive TLS [推荐，不支持ClashMeta] ================================\n"
jq -r -c '.inbounds[]|.users[]' "${configPath}10_naive_inbounds.json" | while read -r user; do jq -r -c '.inbounds[]|.users[]' "${configPath}10_naive_inbounds.json" | while read -r user; do
@ -8448,7 +8453,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.1.25" echoContent green "当前版本：v3.1.26"
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