From 64a26fcddc997ddc2e4a0336b8d13244d8354fdf Mon Sep 17 00:00:00 2001 From: Loyalsoldier Date: Tue, 24 Dec 2019 01:15:56 +0800 Subject: [PATCH] Fixed regex to remove DOMAIN-KEYWORD rules --- .github/workflows/build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08250bc9f6..589fd3f27f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,7 +72,8 @@ jobs: - name: Get and add proxy domains from @ConnersHua/Profiles into temp-proxy.txt file run: | - curl -sSL $Profiles_URL | awk -F ',' '/^DOMAIN.+PROXY/ {print $2}' >> temp-proxy.txt + curl -sSL $Profiles_URL | awk -F ',' '/^DOMAIN,.+PROXY/ {print $2}' >> temp-proxy.txt + curl -sSL $Profiles_URL | awk -F ',' '/^DOMAIN\-SUFFIX,.+PROXY/ {print $2}' >> temp-proxy.txt - name: Get and add blocked domains from @wongsyrone/domain-block-list into temp-proxy.txt file run: | @@ -80,7 +81,8 @@ jobs: - name: Get and add direct domains from @ConnersHua/Profiles into temp-direct.txt file run: | - curl -sSL $Profiles_URL | awk -F ',' '/^DOMAIN.+DIRECT/ {print $2}' > temp-direct.txt + curl -sSL $Profiles_URL | awk -F ',' '/^DOMAIN,.+DIRECT/ {print $2}' > temp-direct.txt + curl -sSL $Profiles_URL | awk -F ',' '/^DOMAIN\-SUFFIX,.+DIRECT/ {print $2}' >> temp-direct.txt - name: Get and add chinalist domains into temp-direct.txt file run: | @@ -89,7 +91,8 @@ jobs: - name: Get and add rejected domains from @ConnersHua/Profiles into category-ads-all run: | cd $GOPATH/src/$GEOSITE_REPO/data - curl -sSL $Profiles_URL | awk -F ',' '/^DOMAIN.+REJECT/ {print $2}' > profilereject + curl -sSL $Profiles_URL | awk -F ',' '/^DOMAIN,.+REJECT/ {print $2}' > profilereject + curl -sSL $Profiles_URL | awk -F ',' '/^DOMAIN\-SUFFIX,.+REJECT/ {print $2}' >> profilereject echo "include:profilereject" >> category-ads-all - name: Add proxy and direct domains from the branch named hidden of this repo to appropriate temp files