From f24e9a907fe06af2863ae62a4e6ce57d17b47ef8 Mon Sep 17 00:00:00 2001 From: mikhaelkh Date: Fri, 29 May 2015 23:49:41 +0300 Subject: [PATCH] Minor fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit µMatrix -> uMatrix in tools folder. Small fix in hosts-files.json. --- assets/checksums.txt | 2 +- assets/umatrix/hosts-files.json | 2 +- tools/commit-assets.sh | 8 ++++---- tools/make-chromium.sh | 8 ++++---- tools/make-clean.sh | 4 ++-- tools/update-3rdparties.sh | 2 +- tools/update-checksums.sh | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/assets/checksums.txt b/assets/checksums.txt index 970b1e2..20886c5 100644 --- a/assets/checksums.txt +++ b/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 diff --git a/assets/umatrix/hosts-files.json b/assets/umatrix/hosts-files.json index fdec4fd..e6ed89a 100644 --- a/assets/umatrix/hosts-files.json +++ b/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", diff --git a/tools/commit-assets.sh b/tools/commit-assets.sh index aedf95e..5d73168 100755 --- a/tools/commit-assets.sh +++ b/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." diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh index 0053544..9e9de1a 100755 --- a/tools/make-chromium.sh +++ b/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." diff --git a/tools/make-clean.sh b/tools/make-clean.sh index a1fb8d7..17b70d3 100755 --- a/tools/make-clean.sh +++ b/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." diff --git a/tools/update-3rdparties.sh b/tools/update-3rdparties.sh index 5689ccb..162ed84 100755 --- a/tools/update-3rdparties.sh +++ b/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' diff --git a/tools/update-checksums.sh b/tools/update-checksums.sh index 8576797..e003dba 100755 --- a/tools/update-checksums.sh +++ b/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."