mack-a
/
v2ray-agent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(脚本): 修改path展示错误问题

dev
mack-a 2023-03-24 22:29:23 +08:00
parent 1f043dd179
commit b7de041480
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
install.sh
View File

@ -498,7 +498,7 @@ readConfigHostPathUUID() {
currentPort= currentPort=
currentAdd= currentAdd=
# 读取path # 读取path
if [[ -n "${configPath}" && -z "${realityStatus}" ]]; then if [[ -n "${configPath}" && -n "${frontingType}" ]]; then
local fallback local fallback
fallback=$(jq -r -c '.inbounds[0].settings.fallbacks[]|select(.path)' ${configPath}${frontingType}.json | head -1) fallback=$(jq -r -c '.inbounds[0].settings.fallbacks[]|select(.path)' ${configPath}${frontingType}.json | head -1)
@ -507,13 +507,11 @@ readConfigHostPathUUID() {
if [[ $(echo "${fallback}" | jq -r .dest) == 31297 ]]; then if [[ $(echo "${fallback}" | jq -r .dest) == 31297 ]]; then
currentPath=$(echo "${path}" | awk -F "[w][s]" '{print $1}') currentPath=$(echo "${path}" | awk -F "[w][s]" '{print $1}')
# elif [[ $(echo "${fallback}" | jq -r .dest) == 31298 ]]; then
# currentPath=$(echo "${path}" | awk -F "[t][c][p]" '{print $1}')
elif [[ $(echo "${fallback}" | jq -r .dest) == 31299 ]]; then elif [[ $(echo "${fallback}" | jq -r .dest) == 31299 ]]; then
currentPath=$(echo "${path}" | awk -F "[v][w][s]" '{print $1}') currentPath=$(echo "${path}" | awk -F "[v][w][s]" '{print $1}')
fi fi
# 尝试读取alpn h2 Path
# 尝试读取alpn h2 Path
if [[ -z "${currentPath}" ]]; then if [[ -z "${currentPath}" ]]; then
dest=$(jq -r -c '.inbounds[0].settings.fallbacks[]|select(.alpn)|.dest' ${configPath}${frontingType}.json | head -1) dest=$(jq -r -c '.inbounds[0].settings.fallbacks[]|select(.alpn)|.dest' ${configPath}${frontingType}.json | head -1)
if [[ "${dest}" == "31302" || "${dest}" == "31304" ]]; then if [[ "${dest}" == "31302" || "${dest}" == "31304" ]]; then
@ -5938,7 +5936,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.7.21_reality_beta" echoContent green "当前版本：v2.7.22_reality_beta"
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