Fixed file access + changed GL runner script

2023-02-07 10:08:27 +01:00 · 2023-02-07 10:08:27 +01:00 · c287e90971
parent 71500ab7e2
commit c287e90971
42 changed files with 5 additions and 27 deletions
--- a/.editorconfig
+++ b/.editorconfig
--- a/.environment.yaml
+++ b/.environment.yaml
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@ -49,7 +49,10 @@ jobs:

      - name: Render the rules
        run: |
+          BUILD="$(git rev-parse --short HEAD)"
          flrender -v -i ublockorigin-rules=. adblocker-rules.template _public/blockrules.txt
+          sed -i -e "s/\! BuildID:/\! BuildID: $BUILD/g" _public/blockrules.txt
+          head -n 5 _public/blockrules.txt

      - name: Deploy
        run: |
--- a/.gitignore
+++ b/.gitignore
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
--- a/0
+++ b/0
--- a/0
+++ b/0
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
--- a/0
+++ b/0
--- a/README.md
+++ b/README.md
--- a/_public/anonymous.gif
+++ b/_public/anonymous.gif
--- a/_public/anonymous1.gif
+++ b/_public/anonymous1.gif
--- a/_public/background1.jpg
+++ b/_public/background1.jpg
--- a/_public/index.html
+++ b/_public/index.html
--- a/_public/style.css
+++ b/_public/style.css
--- a/adblocker-rules.template
+++ b/adblocker-rules.template
--- a/docs/python-abp.rst
+++ b/docs/python-abp.rst
--- a/flrender.sh
+++ b/flrender.sh
@ -1,6 +1,6 @@
 #!/usr/bin/env sh

-set -e -x
+set -e #-x

 # This script is to run the flrender tool to generate new adblocker lists
 # from AdBlocker-rules.template.
@ -29,8 +29,7 @@ ls -lha _public/

 head -n 5 _public/blockrules.txt

-sed -i -e "s/\! BuildID:/\! BuildID: $BUILD/g" _public/blockrules.txt | head -n 5
-# perl -pi -e 's/\! BuildID:/\! BuildID: $BUILD/g' _public/blockrules.txt | head -n 5
+sed -i -e "s/\! BuildID:/\! BuildID: $BUILD/g" _public/blockrules.txt

 head -n 5 _public/blockrules.txt

--- a/requirements.txt
+++ b/requirements.txt
--- a/rules/adult_domain.blacklist
+++ b/rules/adult_domain.blacklist
--- a/rules/adult_rule.blacklist
+++ b/rules/adult_rule.blacklist
--- a/rules/adware_domain.blacklist
+++ b/rules/adware_domain.blacklist
--- a/rules/adware_rule.blacklist
+++ b/rules/adware_rule.blacklist
--- a/rules/annoyance_domain.blacklist
+++ b/rules/annoyance_domain.blacklist
--- a/rules/annoyance_rule.blacklist
+++ b/rules/annoyance_rule.blacklist
--- a/rules/anti_social_domain.blacklist
+++ b/rules/anti_social_domain.blacklist
--- a/rules/anti_social_rule.blacklist
+++ b/rules/anti_social_rule.blacklist
--- a/rules/anti_whitelist_domain.blacklist
+++ b/rules/anti_whitelist_domain.blacklist
--- a/rules/anti_whitelist_rule.blacklist
+++ b/rules/anti_whitelist_rule.blacklist
--- a/rules/cookie_domain.blacklist
+++ b/rules/cookie_domain.blacklist
--- a/rules/cookie_rule.blacklist
+++ b/rules/cookie_rule.blacklist
--- a/rules/new_filter.template
+++ b/rules/new_filter.template
--- a/rules/noise.txt
+++ b/rules/noise.txt
--- a/rules/spyware_domain.blacklist
+++ b/rules/spyware_domain.blacklist
--- a/rules/spyware_rule.blacklist
+++ b/rules/spyware_rule.blacklist
--- a/rules/whitelist_domain.whitelist
+++ b/rules/whitelist_domain.whitelist
--- a/rules/whitelist_rule.whitelist
+++ b/rules/whitelist_rule.whitelist
--- a/thirdparties/Yuki2718/ublock-anti-whitelist.txt
+++ b/thirdparties/Yuki2718/ublock-anti-whitelist.txt
@ -1,24 +0,0 @@
-! EasyList
-/prebid1.$important,domain=9to5google.com|9to5mac.com|9to5toys.com|electrek.co|dronedj.com
-||accuweather.com/bundles/prebid.$important
-||g.doubleclick.net/tag/js/gpt.js$important,domain=accuweather.com
-||kissanime.ru/ads/$frame,important
-||www.networkworld.com/www/js/ads/$important
-@@||clients*.google.com/adsense/*?key=$domain=~calcalist.co.il|~gaytube.com|~mako.co.il|~pornhub.com|~pornhubthbh7ap3u.onion|~redtube.com|~redtube.com.br|~tube8.com|~tube8.es|~tube8.fr|~walla.co.il|~xtu,badfilter
-
-! EasyPrivacy
-||omtrdc.net/rest/$important
-||play.google.com/log$important,domain=~myaccount.google.com
-||smetrics.aem.playstation.com^$important
-||www.walmart.com^*/logger^$xhr,important
-@@||s.yimg.com^*/advertisement/sponsor/promo/ad.png$image,domain=news.yahoo.com,badfilter
-@@||youtube.com/api/stats/watchtime?$image,domain=youtube.com,badfilter
-
-! AdGuard Base
-@@||2mdn.net/instream/$badfilter
-! no breakage on my end but if you get, add speedtest.net##+js(set, apstag.init, noopFunc)
-@@||b.cdnst.net/javascript/amazon.js$domain=speedtest.net,badfilter
-@@||imasdk.googleapis.com/js/core/bridge*.html$domain=~spotify.com,badfilter
-@@||krebsonsecurity.com^$badfilter
-@@||s1.wp.com^$badfilter
-@@||wp.com/p/jetpack^$badfilter