sinvo/jd_scripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

只识别第一个new Env的匹配行

Browse Source
This commit is contained in:
anonymous
2021-03-18 21:24:11 +08:00
parent e50c73ba23
commit 48b50c5d58
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
update_list.sh
View File

@ -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|"

10
update_task.sh
View File

@ -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