Browse Source

Merge pull request #241 from mikhaelkh/master

Minor fixes
pull/2/head
Raymond Hill 10 years ago
parent
commit
9f51e49725
  1. 2
      assets/checksums.txt
  2. 2
      assets/umatrix/hosts-files.json
  3. 8
      tools/commit-assets.sh
  4. 8
      tools/make-chromium.sh
  5. 4
      tools/make-clean.sh
  6. 2
      tools/update-3rdparties.sh
  7. 4
      tools/update-checksums.sh

2
assets/checksums.txt

@ -1,4 +1,4 @@
4a3dedc1e913ac1dbb316606a4b5306d assets/umatrix/hosts-files.json
6c5b3873bdb65ad6b4f8c90eb254277e assets/umatrix/hosts-files.json
188ce926323d816ae9d7d5ebbb567862 assets/umatrix/blacklist.txt
1beb3b4b6458f6d3988b91cd981a97f0 assets/thirdparties/mirror1.malwaredomains.com/files/immortal_domains.txt
7f0443f3dcc9abfd47cfbc95ce824ddb assets/thirdparties/mirror1.malwaredomains.com/files/README.md

2
assets/umatrix/hosts-files.json

@ -17,7 +17,7 @@
},
"hosts-file.net/ad-servers": {
"title": "hpHosts’s Ad and tracking servers",
"homeURL": "http://hosts-file.net/.%5Cad_servers.txt"
"homeURL": "http://hosts-file.net/ad_servers.txt"
},
"someonewhocares.org/hosts/hosts": {
"title": "Dan Pollock’s hosts file",

8
tools/commit-assets.sh

@ -2,12 +2,12 @@
#
# This script assumes a linux environment
echo "*** µMatrix: git adding changed assets..."
echo "*** uMatrix: git adding changed assets..."
git add --update --ignore-removal --ignore-errors assets
echo "*** µMatrix: git committing assets..."
echo "*** uMatrix: git committing assets..."
git commit -m 'update of third-party assets'
echo "*** µMatrix: git pushing assets to remote master..."
echo "*** uMatrix: git pushing assets to remote master..."
git push origin master
echo "*** µMatrix: git done."
echo "*** uMatrix: git done."

8
tools/make-chromium.sh

@ -2,8 +2,8 @@
#
# This script assumes a linux environment
echo "*** µMatrix(Chromium): Creating package"
echo "*** µMatrix(Chromium): Copying files"
echo "*** uMatrix(Chromium): Creating package"
echo "*** uMatrix(Chromium): Copying files"
DES=./dist/build/uMatrix.chromium
rm -rf $DES
@ -19,10 +19,10 @@ cp ./platform/chromium/manifest.json $DES/
cp LICENSE.txt $DES/
if [ "$1" = all ]; then
echo "*** µMatrix.chromium: Creating package..."
echo "*** uMatrix.chromium: Creating package..."
pushd $(dirname $DES/)
zip uMatrix.chromium.zip -qr $(basename $DES/)/*
popd
fi
echo "*** µMatrix(Chromium): Package done."
echo "*** uMatrix(Chromium): Package done."

4
tools/make-clean.sh

@ -2,6 +2,6 @@
#
# This script assumes a linux environment
echo "*** µMatrix(Chromium): Cleaning."
echo "*** uMatrix(Chromium): Cleaning."
rm -R ./dist/*
echo "*** µMatrix(Chromium): Cleaned."
echo "*** uMatrix(Chromium): Cleaned."

2
tools/update-3rdparties.sh

@ -4,7 +4,7 @@
TEMPFILE=/tmp/umatrix-asset
echo "*** µMatrix: updating remote assets..."
echo "*** uMatrix: updating remote assets..."
THIRDPARTY_REMOTEURLS=(
'http://mirror1.malwaredomains.com/files/immortal_domains.txt'

4
tools/update-checksums.sh

@ -2,12 +2,12 @@
#
# This script assumes a linux environment
echo "*** µMatrix: generating checksums.txt file..."
echo "*** uMatrix: generating checksums.txt file..."
truncate -s 0 assets/checksums.txt
LIST="$(find assets/umatrix assets/thirdparties -type f)"
for ENTRY in $LIST; do
echo `md5sum $ENTRY` >> assets/checksums.txt
done
echo "*** µMatrix: checksums updated."
echo "*** uMatrix: checksums updated."
Loading…
Cancel
Save