From 1b514d22293604357df34276a2372ae762766420 Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Fri, 20 Nov 2020 10:21:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=84=9A=E6=9C=AC):=20=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E5=88=86=E6=94=AF=E5=8D=87=E7=BA=A7=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index f67c800..25bd83f 100644 --- a/install.sh +++ b/install.sh @@ -4,6 +4,7 @@ installType='yum -y install' removeType='yum -y remove' upgrade="yum -y update" echoType='echo -e' +branch=master domain= add= globalType= @@ -358,7 +359,7 @@ nginxBlog(){ # echoContent yellow "添加伪装博客--->" echoContent skyBlue "\n进度 $1/${totalProgress} : 添加伪装博客" rm -rf /usr/share/nginx/html - wget -q -P /usr/share/nginx https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/blog/unable/html.zip > /dev/null + wget -q -P /usr/share/nginx https://raw.githubusercontent.com/mack-a/v2ray-agent/${branch}/fodder/blog/unable/html.zip > /dev/null unzip -o /usr/share/nginx/html.zip -d /usr/share/nginx/html > /dev/null echoContent green " ---> 添加伪装博客成功" } @@ -847,7 +848,7 @@ updateV2RayAgent(){ echo "upgrade|${currentTime}" > /etc/v2ray-agent/upgradeStatus echoContent skyBlue "\n进度 $1/${totalProgress} : 更新v2ray-agent脚本" mkdir -p /etc/v2ray-agent - wget -P /etc/v2ray-agent/ -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/install.sh" && chmod 700 /etc/v2ray-agent/install.sh && vasma + wget -P /etc/v2ray-agent/ -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/${branch}/install.sh" && chmod 700 /etc/v2ray-agent/install.sh && vasma } # 验证整个服务是否可用 @@ -2292,7 +2293,7 @@ menu(){ echoContent yellow "12.查看日志" echoContent yellow "13.卸载脚本" echoContent red "==============================================================" - automaticUpgrade + # automaticUpgrade initCustomInstallType mkdirBaseDIR aliasInstall