From 1d28db8951f521ddeb95d584e7f6a75c479e24ac Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Fri, 18 Dec 2020 20:25:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9v2ray=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E8=90=BDnginx=E7=AB=AF=E5=8F=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/install.sh b/install.sh index 95e2b26..8ebc37c 100644 --- a/install.sh +++ b/install.sh @@ -1538,8 +1538,8 @@ EOF "outbounds": [ { "protocol": "blackhole", - "settings": {} - "tag": "blocked", + "settings": {}, + "tag": "blocked" } ] } @@ -1562,12 +1562,12 @@ EOF EOF # VLESS_TCP_TLS/XTLS # 回落nginx - local fallbacksList='{"dest":31296,"xver":0}' + local fallbacksList='{"dest":31300,"xver":0}' - if [[ -z `echo ${selectCustomInstallType}|grep 4` || "$1" = "all" ]] + if [[ ! -z `echo ${selectCustomInstallType}|grep 4` || "$1" = "all" ]] then # 回落trojan-go - fallbacksList='{"dest":31300,"xver":0}' + fallbacksList='{"dest":31296,"xver":0}' fi # VLESS_WS_TLS @@ -1865,12 +1865,12 @@ EOF EOF # VLESS_TCP_TLS/XTLS # 回落nginx - local fallbacksList='{"dest":31296,"xver":0}' + local fallbacksList='{"dest":31300,"xver":0}' - if [[ -z `echo ${selectCustomInstallType}|grep 4` || "$1" = "all" ]] + if [[ ! -z `echo ${selectCustomInstallType}|grep 4` || "$1" = "all" ]] then # 回落trojan-go - fallbacksList='{"dest":31300,"xver":0}' + fallbacksList='{"dest":31296,"xver":0}' fi # VLESS_WS_TLS From 869851789d0c1e20852635d1be7cac9c14d676d7 Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Fri, 18 Dec 2020 20:26:26 +0800 Subject: [PATCH 2/3] feat(version): upgrade --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 8ebc37c..555de71 100644 --- a/install.sh +++ b/install.sh @@ -3009,7 +3009,7 @@ menu(){ cd echoContent red "\n==============================================================" echoContent green "作者:mack-a" - echoContent green "当前版本:v2.2.1" + echoContent green "当前版本:v2.2.2" echoContent green "Github:https://github.com/mack-a/v2ray-agent" echoContent green "描述:七合一共存脚本" echoContent red "==============================================================" From fd2f24a8bc9ec134bb55c45d6f1a74ced5542edd Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Sat, 19 Dec 2020 14:31:59 +0000 Subject: [PATCH 3/3] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e20d08d..da1b2ba 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,7 @@ - 不支持非root账户 - 现在脚本进入相对稳定的时期,如果有功能不完善的地方,请提issues。 - **脚本默认屏蔽BT**。 +- **中间的版本号升级意味可能不兼容之前安装的内容,如果不是追新用户或者必须升级的版本请谨慎升级。** 例如 2.2.\*,不兼容2.1.\* ## 脚本目录 - v2ray-core 【**/etc/v2ray-agent/v2ray**】