diff options
| author | Raymond Hill <gorhill@users.noreply.github.com> | 2017-01-18 13:17:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 13:17:47 -0500 |
| commit | 3b9fd49c508812dfe2545836c63bd5d8cfd2ead4 (patch) | |
| tree | 6f36522a12e49d15ca3db55db863b70aec302617 /tools | |
| parent | 69fc59305ec60607593474b238e476f808ec7294 (diff) | |
Assets management refactored (#2314)
* refactoring assets management code
* finalizing refactoring of assets management
* various code review of new assets management code
* fix #2281
* fix #1961
* fix #1293
* fix #1275
* fix update scheduler timing logic
* forward compatibility (to be removed once 1.11+ is widespread)
* more codereview; give admins ability to specify own assets.json
* "assetKey" is more accurate than "path"
* fix group count update when building dom incrementally
* reorganize content (order, added URLs, etc.)
* ability to customize updater through advanced settings
* better spinner icon
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/make-assets.sh | 4 | ||||
| -rwxr-xr-x | tools/make-chromium.sh | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tools/make-assets.sh b/tools/make-assets.sh index fade452d..cebea3f4 100755 --- a/tools/make-assets.sh +++ b/tools/make-assets.sh @@ -24,8 +24,6 @@ cp -R ../uAssets/thirdparties/www.malwaredomainlist.com $DES/thirdparti mkdir $DES/ublock cp -R ../uAssets/filters/* $DES/ublock/ -cp -R ./assets/ublock/filter-lists.json $DES/ublock/ - -cp ../uAssets/checksums/ublock0.txt $DES/checksums.txt +cp -R ./assets/assets.json $DES/ echo "done." diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh index 8d1f5891..eda30f29 100755 --- a/tools/make-chromium.sh +++ b/tools/make-chromium.sh @@ -5,7 +5,11 @@ echo "*** uBlock0.chromium: Creating web store package" echo "*** uBlock0.chromium: Copying files" -DES=dist/build/uBlock0.chromium +if [ "$1" = experimental ]; then + DES=dist/build/experimental/uBlock0.chromium +else + DES=dist/build/uBlock0.chromium +fi rm -rf $DES mkdir -p $DES |