feat(脚本): 删除禁用BT、README修改描述

pull/534/merge
mack-a 2021-02-22 14:47:40 +08:00
parent 56eaaaa78d
commit 9f50f6622c
2 changed files with 29 additions and 28 deletions

View File

@ -80,11 +80,11 @@
- wget: command not found [**这里需要自己手动安装下wget**] - wget: command not found [**这里需要自己手动安装下wget**]
如未使用过Linux[点击查看](https://github.com/mack-a/v2ray-agent/tree/master/documents/install_tools.md)安装教程 如未使用过Linux[点击查看](https://github.com/mack-a/v2ray-agent/tree/master/documents/install_tools.md)安装教程
- 不支持非root账户 - 不支持非root账户
- **~~脚本默认屏蔽BT【已失效】~~**
- **中间的版本号升级意味可能不兼容之前安装的内容,如果不是追新用户或者必须升级的版本请谨慎升级。** 例如 2.2.\*不兼容2.1.\* - **中间的版本号升级意味可能不兼容之前安装的内容,如果不是追新用户或者必须升级的版本请谨慎升级。** 例如 2.2.\*不兼容2.1.\*
- **如发现Nginx相关问题请卸载掉自编译的nginx或者重新build系统** - **如发现Nginx相关问题请卸载掉自编译的nginx或者重新build系统**
- **为了节约时间反馈请带上详细截图或者按照模版规范无截图或者不按照规范的issue会被直接关闭** - **为了节约时间反馈请带上详细截图或者按照模版规范无截图或者不按照规范的issue会被直接关闭**
- **不建议GCP用户使用** - **不建议GCP用户使用**
- **不建议使用Centos以及低版本的系统2.3.x后不再支持Centos6**
## 脚本目录 ## 脚本目录
@ -102,19 +102,19 @@
- 支持快捷方式启动安装完毕后shell输入[**vasma**]即可打开脚本,脚本执行路径[**/etc/v2ray-agent/install.sh**] - 支持快捷方式启动安装完毕后shell输入[**vasma**]即可打开脚本,脚本执行路径[**/etc/v2ray-agent/install.sh**]
- Latest release - 最新版
``` ```
wget -P /root -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/install.sh" && chmod 700 /root/install.sh && /root/install.sh wget -P /root -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/install.sh" && chmod 700 /root/install.sh && /root/install.sh
``` ```
- v2.2.24 - 稳定-v2.2.24
``` ```
wget -P /root -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/9ae23c13a56460d8c14f27c8eb65efc73b173f46/install.sh" && chmod 700 /root/install.sh && /root/install.sh wget -P /root -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/9ae23c13a56460d8c14f27c8eb65efc73b173f46/install.sh" && chmod 700 /root/install.sh && /root/install.sh
``` ```
- v2.1.27 - 稳定-v2.1.27
``` ```
wget -P /root -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/3f8ea0aa364ae2e1e407056074c11b448396261f/install.sh" && chmod 700 /root/install.sh && /root/install.sh wget -P /root -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/3f8ea0aa364ae2e1e407056074c11b448396261f/install.sh" && chmod 700 /root/install.sh && /root/install.sh

View File

@ -1414,18 +1414,18 @@ EOF
} }
EOF EOF
fi fi
# 取消BT
cat <<EOF >/etc/v2ray-agent/v2ray/conf/10_bt_outbounds.json # cat <<EOF >/etc/v2ray-agent/v2ray/conf/10_bt_outbounds.json
{ #{
"outbounds": [ # "outbounds": [
{ # {
"protocol": "blackhole", # "protocol": "blackhole",
"settings": {}, # "settings": {},
"tag": "blocked" # "tag": "blocked"
} # }
] # ]
} #}
EOF #EOF
# dns # dns
cat <<EOF >/etc/v2ray-agent/v2ray/conf/11_dns.json cat <<EOF >/etc/v2ray-agent/v2ray/conf/11_dns.json
@ -1723,17 +1723,18 @@ EOF
EOF EOF
fi fi
cat <<EOF >/etc/v2ray-agent/xray/conf/10_bt_outbounds.json # 取消BT
{ # cat <<EOF >/etc/v2ray-agent/xray/conf/10_bt_outbounds.json
"outbounds": [ #{
{ # "outbounds": [
"protocol": "blackhole", # {
"settings": {}, # "protocol": "blackhole",
"tag": "blocked" # "settings": {},
} # "tag": "blocked"
] # }
} # ]
EOF #}
#EOF
# dns # dns
cat <<EOF >/etc/v2ray-agent/xray/conf/11_dns.json cat <<EOF >/etc/v2ray-agent/xray/conf/11_dns.json
@ -3113,7 +3114,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.3.16" echoContent green "当前版本v2.3.17"
echoContent green "Githubhttps://github.com/mack-a/v2ray-agent" echoContent green "Githubhttps://github.com/mack-a/v2ray-agent"
echoContent green "描述:七合一共存脚本" echoContent green "描述:七合一共存脚本"
echoContent red "==============================================================" echoContent red "=============================================================="