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

feat(脚本): 修复xray-core下 tuic和hysteria2无法共存问题、增加5.Reality管理教程

pull/909/head^2
mack-a 2023-12-26 14:57:27 +08:00
parent 9f2e960423
commit 018b62fa14
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
install.sh
View File

@ -3314,8 +3314,7 @@ singBoxTuicInstall() {
totalProgress=5 totalProgress=5
installSingBox 1 installSingBox 1
selectCustomInstallType=9 selectCustomInstallType=9
# initSingBoxTuicConfig 2 initSingBoxConfig custom 2 true
initSingBoxConfig custom 2
installSingBoxService 3 installSingBoxService 3
reloadCore reloadCore
showAccounts 4 showAccounts 4
@ -3335,7 +3334,7 @@ singBoxHysteria2Install() {
totalProgress=5 totalProgress=5
installSingBox 1 installSingBox 1
selectCustomInstallType=6 selectCustomInstallType=6
initSingBoxConfig custom 2 initSingBoxConfig custom 2 true
installSingBoxService 3 installSingBoxService 3
reloadCore reloadCore
showAccounts 4 showAccounts 4
@ -8075,11 +8074,10 @@ xrayCoreRealityInstall() {
} }
# reality管理 # reality管理
manageReality() { manageReality() {
readInstallProtocolType readInstallProtocolType
if ! echo "${currentInstallProtocolType}" | grep -q -E "7|8" || [[ -z "${coreInstallType}" ]]; then if ! echo "${currentInstallProtocolType}" | grep -q -E "7|8" || [[ -z "${coreInstallType}" ]]; then
echoContent red "\n ---> 请先安装Reality协议" echoContent red "\n ---> 请先安装Reality协议，参考教程 https://www.v2ray-agent.com/archives/1680104902581#heading-11"
exit 0 exit 0
fi fi
@ -8163,7 +8161,6 @@ manageHysteria() {
echoContent red "==============================================================" echoContent red "=============================================================="
read -r -p "请选择:" installHysteria2Status read -r -p "请选择:" installHysteria2Status
if [[ "${installHysteria2Status}" == "1" ]]; then if [[ "${installHysteria2Status}" == "1" ]]; then
unInstallHysteriaCore
singBoxHysteria2Install singBoxHysteria2Install
elif [[ "${installHysteria2Status}" == "2" && "${hysteria2Status}" == "true" ]]; then elif [[ "${installHysteria2Status}" == "2" && "${hysteria2Status}" == "true" ]]; then
unInstallSingBox hysteria2 unInstallSingBox hysteria2
@ -8187,7 +8184,6 @@ manageTuic() {
echoContent red "==============================================================" echoContent red "=============================================================="
read -r -p "请选择:" installTuicStatus read -r -p "请选择:" installTuicStatus
if [[ "${installTuicStatus}" == "1" ]]; then if [[ "${installTuicStatus}" == "1" ]]; then
unInstallTuicCore
singBoxTuicInstall singBoxTuicInstall
elif [[ "${installTuicStatus}" == "2" && "${tuicStatus}" == "true" ]]; then elif [[ "${installTuicStatus}" == "2" && "${tuicStatus}" == "true" ]]; then
unInstallSingBox tuic unInstallSingBox tuic
@ -8293,7 +8289,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.1.16" echoContent green "当前版本：v3.1.17"
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