diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 7da7cea1..8bbe2e2c 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -99,20 +99,20 @@ jobs: - name: Remove redundant domains run: | - chmod +x findRedundantDomain.py - ./findRedundantDomain.py ./direct-list-with-redundant ./direct-list-deleted-unsort - ./findRedundantDomain.py ./proxy-list-with-redundant ./proxy-list-deleted-unsort + chmod +x *.py + python ./findRedundantDomain.py ./direct-list-with-redundant ./direct-list-deleted-unsort + python ./findRedundantDomain.py ./proxy-list-with-redundant ./proxy-list-deleted-unsort [ ! -f "direct-list-deleted-unsort" ] && touch direct-list-deleted-unsort [ ! -f "proxy-list-deleted-unsort" ] && touch proxy-list-deleted-unsort sort ./direct-list-deleted-unsort > ./direct-list-deleted-sort sort ./proxy-list-deleted-unsort > ./proxy-list-deleted-sort - diff ./direct-list-deleted-sort ./direct-list-with-redundant | awk '/^>/{print $2}' > ./direct-list-without-redundant - diff ./proxy-list-deleted-sort ./proxy-list-with-redundant | awk '/^>/{print $2}' > ./proxy-list-without-redundant + python ./removeFrom.py -remove ./direct-list-deleted-sort -from ./direct-list-with-redundant -out direct-list-without-redundant + python ./removeFrom.py -remove ./proxy-list-deleted-sort -from ./proxy-list-with-redundant -out proxy-list-without-redundant - name: Remove domains from "need-to-remove" lists in "hidden" branch run: | - diff ./direct-need-to-remove.txt ./direct-list-without-redundant | awk '/^>/{print $2}' > temp-cn.txt - diff ./proxy-need-to-remove.txt ./proxy-list-without-redundant | awk '/^>/{print $2}' > temp-geolocation-\!cn.txt + python ./removeFrom.py -remove ./direct-need-to-remove.txt -from ./direct-list-without-redundant -out temp-cn.txt + python ./removeFrom.py -remove ./proxy-need-to-remove.txt -from ./proxy-list-without-redundant -out temp-geolocation-\!cn.txt - name: Remove domains end with ".cn" in "temp-geolocation-!cn.txt" and write lists to data directory run: |