From 35acb337ee6bab7fb5ed28f03c82ecfcd512bd4b Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Thu, 15 Apr 2021 09:34:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=84=9A=E6=9C=AC):=20readme=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=9B=AE=E5=BD=95=E8=AF=B4=E6=98=8E=E3=80=81=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E6=B7=BB=E5=8A=A0=E7=AB=AF=E5=8F=A3=E5=8D=B8=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 46 +++++++++++++++++++++++++++++++++++++++++----- install.sh | 25 ++++++++++++++++++------- 2 files changed, 59 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index b0b6105..4ccc17a 100644 --- a/README.md +++ b/README.md @@ -94,11 +94,47 @@ ## 脚本目录 -- v2ray-core 【**/etc/v2ray-agent/v2ray、/etc/v2ray-agent/v2ray/conf**】 -- Xray-core 【**/etc/v2ray-agent/xray、/etc/v2ray-agent/xray/conf**】 -- Trojan 【**/etc/v2ray-agent/trojan**】 -- TLS证书 【**/etc/v2ray-agent/tls**】 -- Nginx配置文件 【**/etc/nginx/conf.d/alone.conf**】、Nginx伪装站点目录 【**/usr/share/nginx/html**】 +### Xray-core +- 主目录 +``` +/etc/v2ray-agent/xray +``` +- 配置文件目录 +``` +/etc/v2ray-agent/xray/conf +``` + +### v2ray-core +- 主目录 +``` +/etc/v2ray-agent/v2ray +``` +- 配置文件目录 +``` +/etc/v2ray-agent/v2ray/conf +``` + +### Trojan +- 目录 +``` +/etc/v2ray-agent/trojan +``` + +### TLS证书 +- 目录 +``` +/etc/v2ray-agent/tls +``` + +### Nginx +- Nginx配置文件 +``` +/etc/nginx/conf.d/alone.conf +``` +- Nginx伪装站点目录 +``` +/usr/share/nginx/html +``` ## [脚本功能详解、错误处理、常用命令](https://github.com/mack-a/v2ray-agent/blob/master/documents/how_to_use.md) diff --git a/install.sh b/install.sh index 43ad5bc..417ada9 100644 --- a/install.sh +++ b/install.sh @@ -2276,11 +2276,16 @@ addCorePort() { echoContent yellow "1.只允许添加443之外的一个端口" echoContent yellow "2.不影响443端口的使用" echoContent yellow "3.查看帐号时,只会展示默认端口443的帐号" - echoContent yellow "4.再次添加时会替换之前添加的端口\n" - read -r -p "请输入端口号:" newPort - if [[ -n "${newPort}" ]]; then - - cat <${configPath}02_dokodemodoor_inbounds.json + echoContent yellow "4.再次添加时会替换之前添加的端口" + echoContent red "==============================================================" + echoContent yellow "1.添加端口" + echoContent yellow "2.卸载" + echoContent red "==============================================================" + read -r -p "请选择:" selectNewPortType + if [[ "${selectNewPortType}" == "1" ]]; then + read -r -p "请输入端口号:" newPort + if [[ -n "${newPort}" ]]; then + cat <${configPath}02_dokodemodoor_inbounds.json { "inbounds": [ { @@ -2305,9 +2310,15 @@ addCorePort() { ] } EOF - echoContent green " ---> 添加成功" + echoContent green " ---> 添加成功" + reloadCore + fi + elif [[ "${selectNewPortType}" == "2" ]]; then + rm ${configPath}02_dokodemodoor_inbounds.json + echoContent green " ---> 卸载完成" reloadCore fi + } # 卸载脚本 unInstall() { @@ -3591,7 +3602,7 @@ menu() { cd "$HOME" || exit echoContent red "\n==============================================================" echoContent green "作者:mack-a" - echoContent green "当前版本:v2.4.13" + echoContent green "当前版本:v2.4.15" echoContent green "Github:https://github.com/mack-a/v2ray-agent" echoContent green "描述:七合一共存脚本\c" showInstallStatus