From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 25 Sep 2019 17:30:08 +0000 (+0200)
Subject: Update Firefox stuff versions.
X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/day?a=commitdiff_plain;h=5d9b221a50f08e13ee43089baec396536fe8e4d7;p=config

Update Firefox stuff versions.
---

diff --git a/buster/setup_scripts/setup_desktop.sh b/buster/setup_scripts/setup_desktop.sh
index 3c66cea..04f49cf 100755
--- a/buster/setup_scripts/setup_desktop.sh
+++ b/buster/setup_scripts/setup_desktop.sh
@@ -20,7 +20,7 @@ cd "${setup_scripts_dir}"
 ./install_for_target.sh user "${system_name}"
 
 # Install Firefox directly from Mozilla.
-firefox_release="68.0esr"
+firefox_release="68.1.0esr"
 firefox_filename="firefox-${firefox_release}.tar.bz2"
 url_firefox="https://ftp.mozilla.org/pub/firefox/releases/${firefox_release}/linux-x86_64/en-US/${firefox_filename}"
 wget "${url_firefox}"
@@ -36,17 +36,14 @@ 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}"
+umatrix_version="1.4.0"
 umatrix_xpi="uMatrix.firefox.signed.xpi"
-url_umatrix="https://github.com/gorhill/uMatrix/releases/download/1.3.17rc4/${umatrix_xpi}"
+url_umatrix="https://github.com/gorhill/uMatrix/releases/download/${umatrix_version}/${umatrix_xpi}"
 wget "${url_umatrix}"
 name=$(unzip -p "${umatrix_xpi}" manifest.json | jq -r .applications.gecko.id)
 mv "${umatrix_xpi}" "${name}".xpi
-#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"
+tridactyl_version="1.16.3pre3162"
+tridactyl_xpi="tridactyl_beta-${tridactyl_version}-an+fx.xpi"
 url_tridactyl="https://tridactyl.cmcaine.co.uk/betas/${tridactyl_xpi}"
 wget "${url_tridactyl}"
 name=$(unzip -p "${tridactyl_xpi}" manifest.json | jq -r .applications.gecko.id)