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