Bump Firefox and its plugins' versions.

[config] / buster / setup_scripts / setup_desktop.sh

diff --git a/buster/setup_scripts/setup_desktop.sh b/buster/setup_scripts/setup_desktop.sh
index 04f49cf3ee605e11126bc19eeefe2e9cd17ddf97..4cce5db7677b0d6ea063ce7f413f4d59fc3238ef 100755 (executable)
--- a/buster/setup_scripts/setup_desktop.sh
+++ b/buster/setup_scripts/setup_desktop.sh
@@ -19,8 +19,12 @@ cd "${setup_scripts_dir}"
 ./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" user "${system_name}"
 ./install_for_target.sh user "${system_name}"
 
+# Set up printer.
+lpadmin -p 'HP_Deskjet_F300_series' -m 'drv:///hpcups.drv/hp-deskjet_f300_series.ppd' -o 'OutputMode=NormalGray'
+service cups restart
+
 # Install Firefox directly from Mozilla.
-firefox_release="68.1.0esr"
+firefox_release="68.4.1esr"
 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}"
@@ -37,12 +41,12 @@ update-alternatives --set x-www-browser /opt/firefox/firefox
 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"
+umatrix_xpi="uMatrix.firefox.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
-tridactyl_version="1.16.3pre3162"
+tridactyl_version="1.17.1pre3455"
 tridactyl_xpi="tridactyl_beta-${tridactyl_version}-an+fx.xpi"
 url_tridactyl="https://tridactyl.cmcaine.co.uk/betas/${tridactyl_xpi}"
 wget "${url_tridactyl}"
@@ -56,7 +60,9 @@ source_dir_secrets="/media/${secrets_dev}/to_usb"
 target_dir_secrets="/home/plom/tmp_secrets"
 cd "${setup_scripts_dir}"
 ./copy_dirtree.sh "${config_tree_prefix}/home_files" "/root" minimal root
+set +e
 HOME_DIR_EXISTS=$([ ! -d "/home/plom" ]; echo $?)
+set -e
 adduser --disabled-password --gecos "" plom
 usermod -a -G sudo plom
 passwd plom