From 94321937ab75a2d5e3b7d556862e4269a5928328 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Thu, 23 Oct 2014 10:33:50 -0400
Subject: [PATCH] tools to update assets

---
 tools/commit-assets.sh     | 13 +++++++++++++
 tools/make-chromium.sh     |  1 +
 tools/update-3rdparties.sh | 18 +++++++++---------
 tools/update-checksums.sh  |  8 +++-----
 tools/update-git.sh        | 13 -------------
 5 files changed, 26 insertions(+), 27 deletions(-)
 create mode 100755 tools/commit-assets.sh
 delete mode 100755 tools/update-git.sh

diff --git a/tools/commit-assets.sh b/tools/commit-assets.sh
new file mode 100755
index 0000000..aedf95e
--- /dev/null
+++ b/tools/commit-assets.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# This script assumes a linux environment
+
+echo "*** µMatrix: git adding changed assets..."
+git add --update --ignore-removal --ignore-errors assets
+echo "*** µMatrix: git committing assets..."
+git commit -m 'update of third-party assets'
+echo "*** µMatrix: git pushing assets to remote master..."
+git push origin master
+
+echo "*** µMatrix: git done."
+
diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh
index 9202a2e..b312a96 100755
--- a/tools/make-chromium.sh
+++ b/tools/make-chromium.sh
@@ -7,5 +7,6 @@ echo "*** µMatrix(Chromium): Copying files"
 mkdir -p ./dist/chromium
 cp -R ./src/*           ./dist/chromium/
 cp -R ./tools/_locales  ./dist/chromium/
+cp -R ./assets          ./dist/chromium/
 cp    ./meta/chromium/* ./dist/chromium/
 echo "*** µMatrix(Chromium): Package done."
diff --git a/tools/update-3rdparties.sh b/tools/update-3rdparties.sh
index 3b80da7..5689ccb 100755
--- a/tools/update-3rdparties.sh
+++ b/tools/update-3rdparties.sh
@@ -4,7 +4,7 @@
 
 TEMPFILE=/tmp/umatrix-asset
 
-echo "*** HTTP Switchboard: updating remote assets..."
+echo "*** µMatrix: updating remote assets..."
 
 THIRDPARTY_REMOTEURLS=(
     'http://mirror1.malwaredomains.com/files/immortal_domains.txt'
@@ -18,14 +18,14 @@ THIRDPARTY_REMOTEURLS=(
     )
 
 THIRDPARTY_LOCALURLS=(
-    'thirdparties/mirror1.malwaredomains.com/files/immortal_domains.txt'
-    'thirdparties/mirror1.malwaredomains.com/files/justdomains'
-    'thirdparties/pgl.yoyo.org/as/serverlist'
-    'thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt'
-    'thirdparties/hosts-file.net/ad-servers'
-    'thirdparties/someonewhocares.org/hosts/hosts'
-    'thirdparties/winhelp2002.mvps.org/hosts.txt'
-    'thirdparties/publicsuffix.org/list/effective_tld_names.dat'
+    'assets/thirdparties/mirror1.malwaredomains.com/files/immortal_domains.txt'
+    'assets/thirdparties/mirror1.malwaredomains.com/files/justdomains'
+    'assets/thirdparties/pgl.yoyo.org/as/serverlist'
+    'assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt'
+    'assets/thirdparties/hosts-file.net/ad-servers'
+    'assets/thirdparties/someonewhocares.org/hosts/hosts'
+    'assets/thirdparties/winhelp2002.mvps.org/hosts.txt'
+    'assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat'
     )
 
 ENTRY_INDEX=0
diff --git a/tools/update-checksums.sh b/tools/update-checksums.sh
index 19e1f6b..8576797 100755
--- a/tools/update-checksums.sh
+++ b/tools/update-checksums.sh
@@ -2,14 +2,12 @@
 #
 # This script assumes a linux environment
 
-echo "*** HTTP Switchboard: generating checksums.txt file..."
-pushd ..
+echo "*** µMatrix: generating checksums.txt file..."
 truncate -s 0 assets/checksums.txt
-LIST="$(find assets/httpsb assets/thirdparties -type f)"
+LIST="$(find assets/umatrix assets/thirdparties -type f)"
 for ENTRY in $LIST; do
     echo `md5sum $ENTRY` >> assets/checksums.txt
 done
-popd
 
-echo "*** HTTP Switchboard: checksums updated."
+echo "*** µMatrix: checksums updated."
 
diff --git a/tools/update-git.sh b/tools/update-git.sh
deleted file mode 100755
index fb058fb..0000000
--- a/tools/update-git.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-#
-# This script assumes a linux environment
-
-echo "*** HTTP Switchboard: git adding changed assets..."
-git add --update --ignore-removal --ignore-errors ./*
-echo "*** HTTP Switchboard: git committing assets..."
-git commit -m 'update of third-party assets'
-echo "*** HTTP Switchboard: git pushing assets to remote master..."
-git push origin master
-
-echo "*** HTTP Switchboard: git done."
-