Make blocking cookie banners more reliable (#699)

sissbruecker · Apr 15, 2024 · 22ffecb · 22ffecb
1 parent d9096ea
commit 22ffecb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docker/alpine.Dockerfile b/docker/alpine.Dockerfile
@@ -112,7 +112,7 @@ RUN TAG=$(curl -sL https://api.github.com/repos/gorhill/uBlock/releases/latest |
     unzip uBlock0.zip
 # Patch assets.json to enable easylist-cookies by default
 RUN curl -L -o ./uBlock0.chromium/assets/thirdparties/easylist/easylist-cookies.txt https://ublockorigin.github.io/uAssets/thirdparties/easylist-cookies.txt
-RUN jq '."fanboy-cookiemonster" |= del(.off) | ."fanboy-cookiemonster".contentURL += ["assets/thirdparties/easylist/easylist-cookies.txt"]' ./uBlock0.chromium/assets/assets.json > temp.json &&  \
+RUN jq '."assets.json" |= del(.cdnURLs) | ."assets.json".contentURL = ["assets/assets.json"] | ."fanboy-cookiemonster" |= del(.off) | ."fanboy-cookiemonster".contentURL += ["assets/thirdparties/easylist/easylist-cookies.txt"]' ./uBlock0.chromium/assets/assets.json > temp.json && \
     mv temp.json ./uBlock0.chromium/assets/assets.json
 
 

diff --git a/docker/default.Dockerfile b/docker/default.Dockerfile
@@ -110,7 +110,7 @@ RUN TAG=$(curl -sL https://api.github.com/repos/gorhill/uBlock/releases/latest |
     unzip uBlock0.zip
 # Patch assets.json to enable easylist-cookies by default
 RUN curl -L -o ./uBlock0.chromium/assets/thirdparties/easylist/easylist-cookies.txt https://ublockorigin.github.io/uAssets/thirdparties/easylist-cookies.txt
-RUN jq '."fanboy-cookiemonster" |= del(.off) | ."fanboy-cookiemonster".contentURL += ["assets/thirdparties/easylist/easylist-cookies.txt"]' ./uBlock0.chromium/assets/assets.json > temp.json &&  \
+RUN jq '."assets.json" |= del(.cdnURLs) | ."assets.json".contentURL = ["assets/assets.json"] | ."fanboy-cookiemonster" |= del(.off) | ."fanboy-cookiemonster".contentURL += ["assets/thirdparties/easylist/easylist-cookies.txt"]' ./uBlock0.chromium/assets/assets.json > temp.json && \
     mv temp.json ./uBlock0.chromium/assets/assets.json
 
 

diff --git a/scripts/setup-ublock.sh b/scripts/setup-ublock.sh
@@ -7,7 +7,7 @@ unzip uBlock0.zip
 rm uBlock0.zip
 
 curl -L -o ./uBlock0.chromium/assets/thirdparties/easylist/easylist-cookies.txt https://ublockorigin.github.io/uAssets/thirdparties/easylist-cookies.txt
-jq '."fanboy-cookiemonster" |= del(.off) | ."fanboy-cookiemonster".contentURL += ["assets/thirdparties/easylist/easylist-cookies.txt"]' ./uBlock0.chromium/assets/assets.json > temp.json
+jq '."assets.json" |= del(.cdnURLs) | ."assets.json".contentURL = ["assets/assets.json"] | ."fanboy-cookiemonster" |= del(.off) | ."fanboy-cookiemonster".contentURL += ["assets/thirdparties/easylist/easylist-cookies.txt"]' ./uBlock0.chromium/assets/assets.json > temp.json
 mv temp.json ./uBlock0.chromium/assets/assets.json
 
 mkdir -p chromium-profile