From d707a96ac502d3e0ecbf3e0cdd5406a378e76588 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Thu, 8 Aug 2019 22:53:13 +0200
Subject: [PATCH] WIP.

---
 buster/apt-mark/eeepc               |  1 +
 buster/setup_scripts/setup_eeepc.sh | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/buster/apt-mark/eeepc b/buster/apt-mark/eeepc
index 3b92f84..a8cd150 100644
--- a/buster/apt-mark/eeepc
+++ b/buster/apt-mark/eeepc
@@ -36,6 +36,7 @@ sudo
 less
 man-db
 manpages
+procps
 # firefox dependencies
 libdbus-glib-1-2
 libgtk-3-0
diff --git a/buster/setup_scripts/setup_eeepc.sh b/buster/setup_scripts/setup_eeepc.sh
index f6d24f3..4b139cc 100755
--- a/buster/setup_scripts/setup_eeepc.sh
+++ b/buster/setup_scripts/setup_eeepc.sh
@@ -32,11 +32,16 @@ update-alternatives --set x-www-browser /opt/firefox/firefox
 # See <https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Distribution_options/Sideloading_add-ons>
 extensions_dir="/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/"
 mkdir -p "${extensions_dir}"
-noscript_xpi="noscript-11.0.2.xpi"
-url_noscript="https://secure.informaction.com/download/releases/${noscript_xpi}"
-wget "${url_noscript}"
-name=$(unzip -p "${noscript_xpi}" manifest.json | jq -r .applications.gecko.id)
-mv "${noscript_xpi}" "${name}.xpi"
+umatrix_xpi="uMatrix.firefox.signed.xpi"
+url_umatrix="https://github.com/gorhill/uMatrix/releases/download/1.3.17rc4/${umatrix_xpi}"
+wget "${url_umatrix}"
+name=$(unzip -p "${umatrix_xpi}" manifest.json | jq -r .applications.gecko.id)
+mv "${umatrix_xpi}" "${name}"
+#noscript_xpi="noscript-11.0.2.xpi"
+#url_noscript="https://secure.informaction.com/download/releases/${noscript_xpi}"
+#wget "${url_noscript}"
+#name=$(unzip -p "${noscript_xpi}" manifest.json | jq -r .applications.gecko.id)
+#mv "${noscript_xpi}" "${name}.xpi"
 tridactyl_xpi="tridactyl-latest.xpi"
 url_tridactyl="https://tridactyl.cmcaine.co.uk/betas/${tridactyl_xpi}"
 wget "${url_tridactyl}"
-- 
2.30.2