From a9f398f063817eba05f5bb0ff8196af39672ab8d Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Tue, 1 Dec 2020 10:02:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=84=9A=E6=9C=AC):=20=E4=BC=AA=E8=A3=85?= =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E9=87=8D=E6=96=B0=E5=AE=89=E8=A3=85=E6=97=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fodder/blog/unable/html.zip | Bin 716171 -> 716284 bytes install.sh | 20 +++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/fodder/blog/unable/html.zip b/fodder/blog/unable/html.zip index bc68ca6dedae8db63ef27d75f7441dbd5a4ca65f..cb45eb4d83ab03d0c44062019c208ea67631193b 100644 GIT binary patch delta 1407 zcmeCat^Mb=wo!mLGYc032;}-V27(z-f|WslA)_QWM?W-zhoNur(fB$b{>msaS>Tbl z8b}R4OhIN|N@|53NG(Wd3{aU%ja(d1>301UTpJy2U^Yx$wj%)920;`9;?pv7Qj6iX zN#>mb83D457os(py6X0rYxbVbdDkG2;+Vw6WyIeo@qCUm9S zZyjbTnP&j9RT5?^*pE;r=H#d6>tz+B!vY5CjP}kXW*}w(Vpbq#+uoVP-m_f~WQ;gA zW6DyB^|Ff54B74{#jzw=7o<1XYH~KnO`zC@#yCUuwz89(GvE4`6 zhx}^{9p$Xd5FOxDkEvw>P)ofeimSAiK(!$I43PmKK7>1y84>JPdmR_m0;4l4l@XZy z5rMU&@mVx5Vn788vXQXNz!3+INNgs~TpY+GZ^FRvZ7L{lAe*>jKNb_AIR(vy(>K1s z2o~)xQ0?GMlZqbpP)~uf401B%LUF>nms}7}K{F5sJOc%Iv$6qWn1LGzCo?lJ1iu0$ FZ2(wpl7RpK delta 1329 zcmex!Tf6(Vc1D0VGm8iV2uxYFBLK{R5xY7!421b@|j0_B56CfsWFmNzrgzCdhvV6+GpbRu=a)XnK9LNNh8o9V#K;6qQ zOxV21srDg<ae%-DW z!?7gU;@eaP20=9a8M#Dg|Gl5X&4lBQ023sv{JwAy@^pK{7mn=>UpOtk+9JnK!+iz@ zE|?4SGD>oD;4VJ{j3LZ;-k879v7V7hgc*0Lfu*9ijvy9kX$WF6EEV-WoSGc=kbwb~ zil8R5Gc0NJ0_GUl19Nt3=H5zMw|)nF-@pC%)|gr zZ^W4p_y*_(P=bSjC5;wI%#h?)PmC{sK@JO;tG$kkYLgilUa|P=Y2k vOc>9;)1C)RaO@FWSGv(z;N#+7my18Qxs7s diff --git a/install.sh b/install.sh index 2ed88ea..12d5ba5 100644 --- a/install.sh +++ b/install.sh @@ -605,9 +605,23 @@ randomPathFunction(){ 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 - unzip -o /usr/share/nginx/html.zip -d /usr/share/nginx/html > /dev/null + if [[ -d "/usr/share/nginx/html" && -f "/usr/share/nginx/html/check" ]] + then + read -p "检测到安装伪装博客,是否需要重新安装[y/n]:" nginxBlogInstallStatus + if [[ "${nginxBlogInstallStatus}" = "y" ]] + then + 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 + unzip -o /usr/share/nginx/html.zip -d /usr/share/nginx/html > /dev/null + rm -f /usr/share/nginx/html.zip* + fi + else + 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 + unzip -o /usr/share/nginx/html.zip -d /usr/share/nginx/html > /dev/null + rm -f /usr/share/nginx/html.zip* + fi + echoContent green " ---> 添加伪装博客成功" } # 操作Nginx