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

fix(脚本): 修改卸载时残留Xray-core配置文件及进程问题

pull/534/merge
mack-a 2022-03-30 15:53:39 +08:00
parent 333cdc748d
commit 46e7b6cc7d
1 changed files with 58 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
install.sh
View File

@ -1626,7 +1626,7 @@ handleXray() {
if [[ -n $(pgrep -f "xray/xray") ]]; then if [[ -n $(pgrep -f "xray/xray") ]]; then
echoContent green " ---> Xray启动成功" echoContent green " ---> Xray启动成功"
else else
echoContent red "xray启动失败" echoContent red "Xray启动失败"
echoContent red "请手动执行【/etc/v2ray-agent/xray/xray -confdir /etc/v2ray-agent/xray/conf】，查看错误日志" echoContent red "请手动执行【/etc/v2ray-agent/xray/xray -confdir /etc/v2ray-agent/xray/conf】，查看错误日志"
exit 0 exit 0
fi fi
@ -1814,28 +1814,28 @@ EOF
{ {
"inbounds":[ "inbounds":[
{ {
"port": 31297, "port": 31297,
"listen": "127.0.0.1", "listen": "127.0.0.1",
"protocol": "vless", "protocol": "vless",
"tag":"VLESSWS", "tag":"VLESSWS",
"settings": { "settings": {
"clients": [ "clients": [
{ {
"id": "${uuid}", "id": "${uuid}",
"email": "${domain}_VLESS_WS" "email": "${domain}_VLESS_WS"
} }
], ],
"decryption": "none" "decryption": "none"
}, },
"streamSettings": { "streamSettings": {
"network": "ws", "network": "ws",
"security": "none", "security": "none",
"wsSettings": { "wsSettings": {
"acceptProxyProtocol": true, "acceptProxyProtocol": true,
"path": "/${customPath}ws" "path": "/${customPath}ws"
} }
} }
} }
] ]
} }
EOF EOF
@ -2222,28 +2222,28 @@ EOF
{ {
"inbounds":[ "inbounds":[
{ {
"port": 31297, "port": 31297,
"listen": "127.0.0.1", "listen": "127.0.0.1",
"protocol": "vless", "protocol": "vless",
"tag":"VLESSWS", "tag":"VLESSWS",
"settings": { "settings": {
"clients": [ "clients": [
{ {
"id": "${uuid}", "id": "${uuid}",
"email": "${domain}_VLESS_WS" "email": "${domain}_VLESS_WS"
} }
], ],
"decryption": "none" "decryption": "none"
}, },
"streamSettings": { "streamSettings": {
"network": "ws", "network": "ws",
"security": "none", "security": "none",
"wsSettings": { "wsSettings": {
"acceptProxyProtocol": true, "acceptProxyProtocol": true,
"path": "/${customPath}ws" "path": "/${customPath}ws"
} }
} }
} }
] ]
} }
EOF EOF
@ -2856,16 +2856,24 @@ unInstall() {
echoContent green " ---> 停止Nginx成功" echoContent green " ---> 停止Nginx成功"
fi fi
handleV2Ray stop if [[ "${coreInstallType}" == "1" ]]; then
# handleTrojanGo stop handleXray stop
rm -rf /etc/systemd/system/xray.service
echoContent green " ---> 删除Xray开机自启完成"
elif [[ "${coreInstallType}" == "2" ]]; then
handleV2Ray stop
rm -rf /etc/systemd/system/v2ray.service
echoContent green " ---> 删除V2Ray开机自启完成"
fi
if [[ -f "/root/.acme.sh/acme.sh.env" ]] && grep -q 'acme.sh.env' </root/.bashrc; then if [[ -f "/root/.acme.sh/acme.sh.env" ]] && grep -q 'acme.sh.env' </root/.bashrc; then
sed -i 's/. "\/root\/.acme.sh\/acme.sh.env"//g' "$(grep '. "/root/.acme.sh/acme.sh.env"' -rl /root/.bashrc)" sed -i 's/. "\/root\/.acme.sh\/acme.sh.env"//g' "$(grep '. "/root/.acme.sh/acme.sh.env"' -rl /root/.bashrc)"
fi fi
rm -rf /root/.acme.sh rm -rf /root/.acme.sh
echoContent green " ---> 删除acme.sh完成" echoContent green " ---> 删除acme.sh完成"
rm -rf /etc/systemd/system/v2ray.service
echoContent green " ---> 删除V2Ray开机自启完成"
rm -rf /tmp/v2ray-agent-tls/* rm -rf /tmp/v2ray-agent-tls/*
if [[ -d "/etc/v2ray-agent/tls" ]] && [[ -n $(find /etc/v2ray-agent/tls/ -name "*.key") ]] && [[ -n $(find /etc/v2ray-agent/tls/ -name "*.crt") ]]; then if [[ -d "/etc/v2ray-agent/tls" ]] && [[ -n $(find /etc/v2ray-agent/tls/ -name "*.key") ]] && [[ -n $(find /etc/v2ray-agent/tls/ -name "*.crt") ]]; then
@ -4421,7 +4429,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.5.56" echoContent green "当前版本:v2.5.57"
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