mack-a
/
v2ray-agent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(脚本): 按照分支升级脚本

pull/534/merge
mack-a 2020-11-20 10:21:59 +08:00
parent 997097b166
commit 1b514d2229
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
install.sh
View File

@ -4,6 +4,7 @@ installType='yum -y install'
removeType='yum -y remove' removeType='yum -y remove'
upgrade="yum -y update" upgrade="yum -y update"
echoType='echo -e' echoType='echo -e'
branch=master
domain= domain=
add= add=
globalType= globalType=
@ -358,7 +359,7 @@ nginxBlog(){
# echoContent yellow "添加伪装博客--->" # echoContent yellow "添加伪装博客--->"
echoContent skyBlue "\n进度 $1/${totalProgress} : 添加伪装博客" echoContent skyBlue "\n进度 $1/${totalProgress} : 添加伪装博客"
rm -rf /usr/share/nginx/html 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 unzip -o /usr/share/nginx/html.zip -d /usr/share/nginx/html > /dev/null
echoContent green " ---> 添加伪装博客成功" echoContent green " ---> 添加伪装博客成功"
} }
@ -847,7 +848,7 @@ updateV2RayAgent(){
echo "upgrade|${currentTime}" > /etc/v2ray-agent/upgradeStatus echo "upgrade|${currentTime}" > /etc/v2ray-agent/upgradeStatus
echoContent skyBlue "\n进度 $1/${totalProgress} : 更新v2ray-agent脚本" echoContent skyBlue "\n进度 $1/${totalProgress} : 更新v2ray-agent脚本"
mkdir -p /etc/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 "12.查看日志"
echoContent yellow "13.卸载脚本" echoContent yellow "13.卸载脚本"
echoContent red "==============================================================" echoContent red "=============================================================="
automaticUpgrade # automaticUpgrade
initCustomInstallType initCustomInstallType
mkdirBaseDIR mkdirBaseDIR
aliasInstall aliasInstall