mirror of https://github.com/mack-a/v2ray-agent
fix(脚本): 修复VMess端口无法识别问题、修复naive报错问题
parent
09b066bacf
commit
de3a3e0e2f
11
install.sh
11
install.sh
|
@ -4665,10 +4665,15 @@ showAccounts() {
|
|||
|
||||
echoContent skyBlue "\n ---> 账号:${email}"
|
||||
echo
|
||||
local vmessPort=${currentDefaultPort}
|
||||
if [[ "${coreInstallType}" == "2" ]]; then
|
||||
vmessPort="${singBoxVMessWSPort}"
|
||||
fi
|
||||
|
||||
local count=
|
||||
while read -r line; do
|
||||
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))
|
||||
fi
|
||||
done < <(echo "${currentAdd}" | tr ',' '\n')
|
||||
|
@ -4760,7 +4765,7 @@ showAccounts() {
|
|||
|
||||
fi
|
||||
# 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"
|
||||
|
||||
jq -r -c '.inbounds[]|.users[]' "${configPath}10_naive_inbounds.json" | while read -r user; do
|
||||
|
@ -8448,7 +8453,7 @@ menu() {
|
|||
cd "$HOME" || exit
|
||||
echoContent red "\n=============================================================="
|
||||
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 "描述:八合一共存脚本\c"
|
||||
showInstallStatus
|
||||
|
|
Loading…
Reference in New Issue