From b85e85be10edc8aa148c9b27b5958359cbc8ba18 Mon Sep 17 00:00:00 2001
From: anonymous <anonymous@gmail.com>
Date: Tue, 23 Feb 2021 20:12:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E9=AB=98=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3=E5=8C=B9=E9=85=8D=E5=87=86=E7=A1=AE=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 update_list.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/update_list.sh b/update_list.sh
index 6142965d..eb7d5126 100644
--- a/update_list.sh
+++ b/update_list.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 ## Author: https://github.com/EvineDeng
-## Modified： 2021-01-31
-## Version： v1.0.2
+## Modified： 2021-02-23
+## Version： v1.0.3
 
 ## 网址、路径、文件、标记信息以及表头
 WorkDir=$(cd $(dirname $0); pwd)
@@ -22,8 +22,8 @@ cd $WorkDir
 Sheet=$SheetHead
 for ((i=0; i<${#JsList[*]}; i++)); do
   Name=$(grep "new Env" ${JsList[i]} | awk -F "'|\"" '{print $2}')
-  Entry=$(grep -E "活动入口" ${JsList[i]} | awk -F "：|: " '{print $2}')
-  [[ -z $Entry ]] || [[ $Entry == 暂无 ]] && Entry=$(grep -E "活动地址" ${JsList[i]} | awk -F "：|: " '{print $2}')
+  Entry=$(grep -E "^ *活动入口" ${JsList[i]} | awk -F "：|: " '{print $2}')
+  [[ -z $Entry ]] || [[ $Entry == 暂无 ]] && Entry=$(grep -E "^ *活动地址" ${JsList[i]} | awk -F "：|: " '{print $2}')
   [[ $Entry == http* ]] && Entry="[活动地址]($Entry)"
   Raw="$UrlRaw${JsList[i]}"
   Sheet="$Sheet\n|$(($i + 1))|[${JsList[i]}]($Raw)|$Name|$Entry|"

From dbb42e2a0abcab606d51282fc7460b9b155c58f4 Mon Sep 17 00:00:00 2001
From: anonymous <anonymous@gmail.com>
Date: Tue, 23 Feb 2021 20:18:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DLoon=20Task=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E5=A4=9A=E4=B8=AA=E8=BF=9E=E7=BB=AD=E7=A9=BA?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=97=B6=E4=B8=8D=E4=BC=9A=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 update_task.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/update_task.sh b/update_task.sh
index b52a52ec..95b587ae 100644
--- a/update_task.sh
+++ b/update_task.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 ## Author: https://github.com/EvineDeng
-## Modified： 2021-01-22
-## Version： v1.0.1
+## Modified： 2021-02-23
+## Version： v1.0.2
 
 ## 路径与清单
 WorkDir=$(cd $(dirname $0); pwd)
@@ -44,4 +44,4 @@ done
 echo -e "  ]\n}" >> $FileQx
 echo -e $CommentsSurgeTail >> $FileSurge
 perl -0777 -i -pe "s|,(\s{1,2}  \])|\1|" $FileQx
-perl -0777 -i -pe "s|# .+\n{2}(# .+)|\1|g" $FileLoon
+perl -0777 -i -pe "s|(# .+\n{2}){1,}(# .+)|\2|g" $FileLoon