From 609eb3633944a708df0a7f96590426bd445d7d64 Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Thu, 10 Sep 2020 17:25:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9F=A5=E6=89=BE=E6=9D=A1=E4=BB=B6=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BC=AA=E8=A3=85=E5=8D=9A=E5=AE=A2=E7=9A=84?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/install.sh b/install.sh
index f473afb..821afbf 100644
--- a/install.sh
+++ b/install.sh
@@ -168,21 +168,21 @@ installTools(){
 
     fi
 
-    if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep wget` ]]
+    if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep -w wget` ]]
     then
 #        progressTools "yellow" "安装wget--->"
         echoContent green " ---> 安装wget"
         ${installType} wget > /dev/null
     fi
 
-    if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep unzip` ]]
+    if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep -w unzip` ]]
     then
         echoContent green " ---> 安装unzip"
 #        progressTools "yellow" "安装unzip--->"
         ${installType} unzip > /dev/null
     fi
 
-    if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep socat` ]]
+    if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep -w socat` ]]
     then
 #        progressTools "yellow" "安装socat--->"
         echoContent green " ---> 安装socat"
@@ -210,7 +210,7 @@ installTools(){
             ${installType} crontabs > /dev/null
         fi
     fi
-    if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep jq` ]]
+    if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep -w jq` ]]
     then
         echoContent green " ---> 安装jq"
         # progressTools "yellow" "安装jq--->"
@@ -224,7 +224,7 @@ installTools(){
         ${installType} binutils > /dev/null  2>&1
     fi
 
-    if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep nginx` ]]
+    if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep -w nginx` ]]
     then
         echoContent green " ---> 安装nginx"
 #        progressTools "yellow" "安装nginx--->"
@@ -415,7 +415,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/blog/unable/html.zip > /dev/null
+    wget -q -P /usr/share/nginx https://raw.githubusercontent.com/mack-a/v2ray-agent/master/fodder/blog/unable/html.zip > /dev/null
     unzip  /usr/share/nginx/html.zip -d /usr/share/nginx/html > /dev/null
 #    echoContent yellow "添加伪装博客成功--->"
     echoContent green " ---> 添加伪装博客成功"