Skip to content

Commit

Permalink
feat(脚本): 修复xray-core下 tuic和hysteria2无法共存问题、增加5.Reality管理教程
Browse files Browse the repository at this point in the history
  • Loading branch information
mack-a committed Dec 26, 2023
1 parent 9f2e960 commit 018b62f
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3314,8 +3314,7 @@ singBoxTuicInstall() {
totalProgress=5
installSingBox 1
selectCustomInstallType=9
# initSingBoxTuicConfig 2
initSingBoxConfig custom 2
initSingBoxConfig custom 2 true
installSingBoxService 3
reloadCore
showAccounts 4
Expand All @@ -3335,7 +3334,7 @@ singBoxHysteria2Install() {
totalProgress=5
installSingBox 1
selectCustomInstallType=6
initSingBoxConfig custom 2
initSingBoxConfig custom 2 true
installSingBoxService 3
reloadCore
showAccounts 4
Expand Down Expand Up @@ -8075,11 +8074,10 @@ xrayCoreRealityInstall() {
}

# reality管理

manageReality() {
readInstallProtocolType
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
fi

Expand Down Expand Up @@ -8163,7 +8161,6 @@ manageHysteria() {
echoContent red "=============================================================="
read -r -p "请选择:" installHysteria2Status
if [[ "${installHysteria2Status}" == "1" ]]; then
unInstallHysteriaCore
singBoxHysteria2Install
elif [[ "${installHysteria2Status}" == "2" && "${hysteria2Status}" == "true" ]]; then
unInstallSingBox hysteria2
Expand All @@ -8187,7 +8184,6 @@ manageTuic() {
echoContent red "=============================================================="
read -r -p "请选择:" installTuicStatus
if [[ "${installTuicStatus}" == "1" ]]; then
unInstallTuicCore
singBoxTuicInstall
elif [[ "${installTuicStatus}" == "2" && "${tuicStatus}" == "true" ]]; then
unInstallSingBox tuic
Expand Down Expand Up @@ -8293,7 +8289,7 @@ menu() {
cd "$HOME" || exit
echoContent red "\n=============================================================="
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 "描述:八合一共存脚本\c"
showInstallStatus
Expand Down

0 comments on commit 018b62f

Please sign in to comment.