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

fix(脚本): 修复使用脚本安装后，宝塔异常关闭问题

pull/1146/head
mack-a 2025-01-13 17:19:18 +08:00
parent f50114ca22
commit 6105ac81d9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
install.sh
View File

@ -419,7 +419,7 @@ readInstallProtocolType() {
xrayVLESSRealityXHTTPort= xrayVLESSRealityXHTTPort=
xrayVLESSRealityXHTTPServerName= xrayVLESSRealityXHTTPServerName=
# currentRealityXHTTPPrivateKey= # currentRealityXHTTPPrivateKey=
currentRealityXHTTPPublicKey= currentRealityXHTTPPublicKey=
currentRealityPrivateKey= currentRealityPrivateKey=
@ -461,7 +461,7 @@ readInstallProtocolType() {
xrayVLESSRealityXHTTPServerName=$(jq -r .inbounds[0].streamSettings.realitySettings.serverNames[0] "${row}.json") xrayVLESSRealityXHTTPServerName=$(jq -r .inbounds[0].streamSettings.realitySettings.serverNames[0] "${row}.json")
currentRealityXHTTPPublicKey=$(jq -r .inbounds[0].streamSettings.realitySettings.publicKey "${row}.json") currentRealityXHTTPPublicKey=$(jq -r .inbounds[0].streamSettings.realitySettings.publicKey "${row}.json")
# currentRealityXHTTPPrivateKey=$(jq -r .inbounds[0].streamSettings.realitySettings.privateKey "${row}.json") # currentRealityXHTTPPrivateKey=$(jq -r .inbounds[0].streamSettings.realitySettings.privateKey "${row}.json")
# if [[ "${coreInstallType}" == "2" ]]; then # if [[ "${coreInstallType}" == "2" ]]; then
# frontingType=03_VLESS_WS_inbounds # frontingType=03_VLESS_WS_inbounds
@ -2136,7 +2136,8 @@ handleNginx() {
systemctl stop nginx systemctl stop nginx
fi fi
sleep 0.5 sleep 0.5
if [[ -n $(pgrep -f "nginx") ]]; then
if [[ -z ${btDomain} && -n $(pgrep -f "nginx") ]]; then
pgrep -f "nginx" | xargs kill -9 pgrep -f "nginx" | xargs kill -9
fi fi
echoContent green " ---> Nginx关闭成功" echoContent green " ---> Nginx关闭成功"
@ -9737,7 +9738,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.3.30" echoContent green "当前版本：v3.3.31"
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