Skip to content

Commit

Permalink
fix(脚本): 修复VMess端口无法识别问题、修复naive报错问题
Browse files Browse the repository at this point in the history
  • Loading branch information
mack-a committed Jan 7, 2024
1 parent 09b066b commit de3a3e0
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit de3a3e0

Please sign in to comment.