diff --git a/update_list.sh b/update_list.sh index c22b079f..b9091302 100644 --- a/update_list.sh +++ b/update_list.sh @@ -21,11 +21,11 @@ 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}' | 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|" + 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|" done echo -e "$Sheet\n$Tail" >> $FileReadme diff --git a/update_task.sh b/update_task.sh index 5d967ca0..ea03b56d 100644 --- a/update_task.sh +++ b/update_task.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash ## Author: https://github.com/nevinee -## Modified: 2021-03-18 -## Version: v1.0.3 +## Modified: 2021-05-22 +## Version: v1.0.4 ## 路径与清单 WorkDir=$(cd $(dirname $0); pwd) @@ -13,7 +13,7 @@ FileQx=$WorkDir/QuantumultX/lxk0301_gallery.json FileQxRe=$WorkDir/QuantumultX/lxk0301_cookies.conf FileSurge=$WorkDir/Surge/lxk0301_Task.sgmodule.sgmodule -## task清单顶部内容 +## task清单头尾部内容 CommentsLoon="# IOS Loon Task&Cookies配置 By lxk0301\n# GitHub主页(https://gitee.com/lxk0301)\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": "lxk0301 task gallery",\n "description": "https://gitee.com/lxk0301",\n "task": [' CommentsQxRe="hostname = draw.jdfcloud.com, jdjoy.jd.com, account.huami.com, me-api.jd.com" @@ -28,18 +28,18 @@ echo -e $CommentsQxRe > $FileQxRe echo -e $CommentsSurgeHead > $FileSurge for file in $JsList do - 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 - grep -E "https://gitee\.com.+tag.+enabled" $file | perl -pe 's|(.+\w)|\1",|' | perl -pe 's|^| \"|' >> $FileQx - grep -E "type.+cronexp.+script-path.+https://gitee\.com" $file >> $FileSurge - fi - grep -E "http-(request|response).+script-path.+https://gitee\.com.+tag" $file | perl -pe "s|(.+tag=)(.+)|\n# \2\n\1\2|" >> $FileLoon - grep -E "script-(request|response)-.+https://gitee\.com" $file | perl -pe "s|(.+)|\n# $TaskName\n\1|" >> $FileQxRe - grep -E "type=http-(request|response).+pattern.+script-path.+https://gitee\.com" $file >> $FileSurge + 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 + grep -E "https://gitee\.com.+tag.+enabled" $file | perl -pe "{s|(.+\w)|\1\", \"addons\":\"https://gitee.com/lxk0301/jd_scripts/raw/master/QuantumultX/lxk0301_cookies.conf\"\},|; s|^| \{\"config\":\"|}" >> $FileQx + grep -E "type.+cronexp.+script-path.+https://gitee\.com" $file >> $FileSurge + fi + grep -E "http-(request|response).+script-path.+https://gitee\.com.+tag" $file | perl -pe "s|(.+tag=)(.+)|\n# \2\n\1\2|" >> $FileLoon + grep -E "script-(request|response)-.+https://gitee\.com" $file | perl -pe "s|(.+)|\n# $TaskName\n\1|" >> $FileQxRe + grep -E "type=http-(request|response).+pattern.+script-path.+https://gitee\.com" $file >> $FileSurge 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\r]{1,2} \])|\1|" $FileQx perl -0777 -i -pe "s|(# .+\n{2}){1,}(# .+)|\2|g" $FileLoon