From 7a0a418568105dfd4184a7a0f0978a34f0400111 Mon Sep 17 00:00:00 2001
From: anonymous <anonymous@gmail.com>
Date: Thu, 18 Mar 2021 21:24:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E8=AF=86=E5=88=AB=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AAnew=20Env=E7=9A=84=E5=8C=B9=E9=85=8D=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 update_list.sh | 12 ++++++------
 update_task.sh | 10 ++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/update_list.sh b/update_list.sh
index 123961fe..c22b079f 100644
--- a/update_list.sh
+++ b/update_list.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-## Author: https://github.com/EvineDeng
-## Modified： 2021-03-02
-## Version： v1.0.4
+## Author: https://github.com/nevinee
+## Modified： 2021-03-18
+## Version： v1.0.5
 
 ## 网址、路径、文件、标记信息以及表头
 WorkDir=$(cd $(dirname $0); pwd)
@@ -21,9 +21,9 @@ perl -i -ne "{print unless $StartLine .. eof}" "$FileReadme"
 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}')
+  Name=$(grep "new Env" ${JsList[i]} | awk -F "'|\"" '{print $2}' | head -1)
+  Entry=$(grep -E "^ *活动入口" ${JsList[i]} | awk -F "：|: " '{print $2}' | head -1)
+  [[ -z $Entry ]] || [[ $Entry == 暂无 ]] && Entry=$(grep -E "^ *活动地址" ${JsList[i]} | awk -F "：|: " '{print $2}' | head -1)
   [[ $Entry == http* ]] && Entry="[活动地址]($Entry)"
   Raw="$UrlRaw${JsList[i]}"
   Sheet="$Sheet\n|$(($i + 1))|[${JsList[i]}]($Raw)|$Name|$Entry|"
diff --git a/update_task.sh b/update_task.sh
index ed308780..a476694c 100644
--- a/update_task.sh
+++ b/update_task.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-## Author: https://github.com/EvineDeng
-## Modified： 2021-02-23
-## Version： v1.0.2
+## Author: https://github.com/nevinee
+## Modified： 2021-03-18
+## Version： v1.0.3
 
 ## 路径与清单
 WorkDir=$(cd $(dirname $0); pwd)
@@ -17,11 +17,9 @@ FileSurge=$WorkDir/Surge/lxk0301_Task.sgmodule.sgmodule
 CommentsLoon="# IOS Loon Task&Cookies配置 By LXK9301\n# GitHub主页(https://gitee.com/lxk0301/jd_scripts/tree/master)\n# TG讨论组 (https://t.me/JD_fruit_pet)\n# TG通知频道 (https://t.me/jdfruit)\n# Loon的Task&Cookies脚本订阅链接: https://gitee.com/lxk0301/jd_scripts/raw/master/Loon/lxk0301_LoonTask.conf\n# 使用方法:打开APP，顶部的配置 -> 脚本 -> 订阅脚本- > 点击右上角+号 -> 添加url链接 (https://gitee.com/lxk0301/jd_scripts/raw/master/Loon/lxk0301_LoonTask.conf)\n\nhostname = me-api.jd.com, draw.jdfcloud.com, jdjoy.jd.com, account.huami.com"
 CommentsQx='{\n  "name": "LXK9301 task gallery",\n  "description": "https://gitee.com/lxk0301/jd_scripts/tree/master",\n  "task": ['
 CommentsQxRe="hostname = draw.jdfcloud.com, jdjoy.jd.com, account.huami.com, me-api.jd.com"
-
 CommentsSurgeHead="#!name=LXK9301 iOS Tasks&Cookies Module\n#!desc=iOS Tasks&Cookies 模块配置\n\n# Task&Cookies模块配置 By LXK9301\n# GitHub主页(https://gitee.com/lxk0301/jd_scripts/tree/master)\n# TG讨论组 (https://t.me/JD_fruit_pet)\n# TG通知频道 (https://t.me/jdfruit)\n# Surge的Task&Cookies脚本模块地址: https://gitee.com/lxk0301/jd_scripts/raw/master/Surge/lxk0301_Task.sgmodule.sgmodule\n\n[Script]"
 CommentsSurgeTail="\n[MITM]\nhostname = %APPEND% me-api.jd.com, draw.jdfcloud.com, jdjoy.jd.com, account.huami.com"
 
-
 ## 执行写入
 cd $WorkDir
 echo -e $CommentsLoon > $FileLoon
@@ -30,7 +28,7 @@ echo -e $CommentsQxRe > $FileQxRe
 echo -e $CommentsSurgeHead > $FileSurge
 for file in $JsList
 do
-  TaskName=$(grep "new Env" $file | awk -F "'|\"" '{print $2}')
+  TaskName=$(grep "new Env" $file | awk -F "'|\"" '{print $2}' | head -1)
   if [[ -n $TaskName ]]; then
     echo -e "\n# $TaskName" >> $FileLoon
     grep -E "cron.+script-path.+https://gitee\.com.+tag" $file >> $FileLoon