From 9fa05aa7c4a2d9ec80f42b9209c8ba8093f60085 Mon Sep 17 00:00:00 2001 From: gorhill Date: Mon, 17 Aug 2015 09:29:11 -0400 Subject: [PATCH] changed "make" scripts for #602 All the assets which are not selected by default out-of-the-box will be converted into an empty file. This is a first step, the final step will be to removed completely the files from the package once everybody is using v1.1.0.0+. --- tools/fix-3p-assets.sh | 53 ++++++++++++++++++++++++++++++++++++++++++ tools/make-chromium.sh | 1 + tools/make-firefox.sh | 1 + tools/make-opera.sh | 1 + 4 files changed, 56 insertions(+) create mode 100755 tools/fix-3p-assets.sh diff --git a/tools/fix-3p-assets.sh b/tools/fix-3p-assets.sh new file mode 100755 index 000000000..0edea10e3 --- /dev/null +++ b/tools/fix-3p-assets.sh @@ -0,0 +1,53 @@ +#!/bin/bash +# +# This script assumes a linux environment + +if [ -z "$1" ]; then + echo "*** uBlock: invalid path." + exit 1 +fi + +echo "*** uBlock: zeroing remote assets..." + +TARGETS=( + "adblock.gardar.net/is.abp.txt" + "adblock.schack.dk/block.txt" + "dl.dropboxusercontent.com/u/1289327/abpxfiles/filtri.txt" + "easylist-downloads.adblockplus.org/advblock.txt" + "easylist-downloads.adblockplus.org/bitblock.txt" + "easylist-downloads.adblockplus.org/easylist_noelemhide.txt" + "easylist-downloads.adblockplus.org/easylistchina.txt" + "easylist-downloads.adblockplus.org/easylistdutch.txt" + "easylist-downloads.adblockplus.org/easylistgermany.txt" + "easylist-downloads.adblockplus.org/easylistitaly.txt" + "easylist-downloads.adblockplus.org/fanboy-annoyance.txt" + "easylist-downloads.adblockplus.org/fanboy-social.txt" + "easylist-downloads.adblockplus.org/liste_fr.txt" + "gitorious.org/adblock-latvian/adblock-latvian/raw/master_lists/latvian-list.txt" + "home.fredfiber.no/langsholt/adblock.txt" + "hosts-file.net/ad-servers" + "liste-ar-adblock.googlecode.com/hg/Liste_AR.txt" + "margevicius.lt/easylistlithuania.txt" + "mirror1.malwaredomains.com/files/immortal_domains.txt" + "raw.githubusercontent.com/AdBlockPlusIsrael/EasyListHebrew/master/EasyListHebrew.txt" + "raw.githubusercontent.com/cjx82630/cjxlist/master/cjxlist.txt" + "raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt" + "raw.githubusercontent.com/szpeter80/hufilter/master/hufilter.txt" + "raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt" + "someonewhocares.org/hosts/hosts" + "spam404bl.com/spam404scamlist.txt" + "stanev.org/abp/adblock_bg.txt" + "winhelp2002.mvps.org/hosts.txt" + "www.fanboy.co.nz/enhancedstats.txt" + "www.fanboy.co.nz/fanboy-antifacebook.txt" + "www.fanboy.co.nz/fanboy-korean.txt" + "www.fanboy.co.nz/fanboy-swedish.txt" + "www.fanboy.co.nz/fanboy-ultimate.txt" + "www.fanboy.co.nz/fanboy-vietnam.txt" + "www.void.gr/kargig/void-gr-filters.txt" + "www.zoso.ro/pages/rolist.txt" +) + +for TARGET in "${TARGETS[@]}"; do + cat /dev/null >| "$1/assets/thirdparties/$TARGET" +done diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh index 3c3ee605c..1290c4b37 100755 --- a/tools/make-chromium.sh +++ b/tools/make-chromium.sh @@ -10,6 +10,7 @@ rm -rf $DES mkdir -p $DES cp -R assets $DES/ +./tools/fix-3p-assets.sh $DES rm $DES/assets/*.sh cp -R src/css $DES/ cp -R src/img $DES/ diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh index 6be51313b..596c3c07f 100755 --- a/tools/make-firefox.sh +++ b/tools/make-firefox.sh @@ -9,6 +9,7 @@ rm -rf $DES mkdir -p $DES cp -R assets $DES/ +./tools/fix-3p-assets.sh $DES rm $DES/assets/*.sh cp -R src/css $DES/ cp -R src/img $DES/ diff --git a/tools/make-opera.sh b/tools/make-opera.sh index 310ffffed..8a5b92200 100755 --- a/tools/make-opera.sh +++ b/tools/make-opera.sh @@ -10,6 +10,7 @@ rm -r $DES mkdir -p $DES cp -R assets $DES/ +./tools/fix-3p-assets.sh $DES rm $DES/assets/*.sh cp -R src/css $DES/ cp -R src/img $DES/