Merge branch 'master' into reality
commit
9c464ccbf1
15
install.sh
15
install.sh
|
@ -3648,15 +3648,12 @@ updateNginxBlog() {
|
|||
fi
|
||||
fi
|
||||
if [[ "${selectInstallNginxBlogType}" =~ ^[1-9]$ ]]; then
|
||||
rm -rf /usr/share/nginx/*
|
||||
if wget --help | grep -q show-progress; then
|
||||
wget -c -q --show-progress -P /usr/share/nginx "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/blog/unable/html${selectInstallNginxBlogType}.zip" >/dev/null
|
||||
else
|
||||
wget -c -P /usr/share/nginx "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/blog/unable/html${selectInstallNginxBlogType}.zip" >/dev/null
|
||||
fi
|
||||
rm -rf "${nginxStaticPath}"
|
||||
|
||||
unzip -o "${nginxStaticPath}${selectInstallNginxBlogType}.zip" -d "${nginxStaticPath}" >/dev/null
|
||||
rm -f "${nginxStaticPath}${selectInstallNginxBlogType}.zip*"
|
||||
wget -q -P "${nginxStaticPath}" "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/blog/unable/html${selectInstallNginxBlogType}.zip" >/dev/null
|
||||
|
||||
unzip -o "${nginxStaticPath}html${selectInstallNginxBlogType}.zip" -d "${nginxStaticPath}" >/dev/null
|
||||
rm -f "${nginxStaticPath}html${selectInstallNginxBlogType}.zip*"
|
||||
echoContent green " ---> 更换伪站成功"
|
||||
else
|
||||
echoContent red " ---> 选择错误,请重新选择"
|
||||
|
@ -5765,7 +5762,7 @@ menu() {
|
|||
cd "$HOME" || exit
|
||||
echoContent red "\n=============================================================="
|
||||
echoContent green "作者:mack-a"
|
||||
echoContent green "当前版本:v2.7.12"
|
||||
echoContent green "当前版本:v2.7.13"
|
||||
echoContent green "Github:https://github.com/mack-a/v2ray-agent"
|
||||
echoContent green "描述:八合一共存脚本\c"
|
||||
showInstallStatus
|
||||
|
|
Loading…
Reference in New Issue