From 30cfeb75f701e7124a7729c502ab701780441888 Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Thu, 15 Oct 2020 15:09:20 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=84=9A=E6=9C=AC=E6=97=B6=E7=9A=84=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- install.sh | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4df14da..153340b 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ - 支持个性化安装,VLESS+TCP为必选,其余为可选项。 - 脚本自动检查升级 - 自动更新TLS证书 -- 支持快捷方式启动,安装完毕后,shell输入[vas]即可打开脚本,脚本路径[/etc/v2ray-agent/install.sh] +- 支持快捷方式启动,安装完毕后,shell输入[vas]即可打开脚本,脚本执行路径[/etc/v2ray-agent/install.sh] ## 注意事项 diff --git a/install.sh b/install.sh index 12a8c0f..838dd8f 100644 --- a/install.sh +++ b/install.sh @@ -777,7 +777,13 @@ updateV2RayAgent(){ local currentTime=`date +%s` echo "upgrade|${currentTime}" > /etc/v2ray-agent/upgradeStatus echoContent skyBlue "\n进度 $1/${totalProgress} : 更新v2ray-agent脚本" - wget -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/install.sh" && chmod +x install.sh && ./install.sh + if [[ -d "/etc/v2ray-agent" ]] + then + wget -P /etc/v2ray-agent/ -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/install.sh" && chmod +x /etc/v2ray-agent/install.sh && /etc/v2ray-agent/install.sh + else + wget -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/install.sh" && chmod +x install.sh && ./install.sh + fi + } # 验证整个服务是否可用 checkGFWStatue(){ @@ -2168,6 +2174,7 @@ aliasInstall(){ else echo noAliasInstall fi + echoContent green " ---> 安装完毕,可执行[vas]重新回到打开脚本" } # 默认安装 defaultInstall(){