X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/form?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_desktop.sh;h=b0d8cd661245262f9828ffc3a4da089b7235b774;hb=6de05dd7a22cbc54f517f2cc5493c81cdbbef29d;hp=1e7d05fa1244b55a7bfeb9160737334993badb87;hpb=f77eab95d7da361254ec5866fea51b006e2a41d8;p=config

diff --git a/buster/setup_scripts/setup_desktop.sh b/buster/setup_scripts/setup_desktop.sh
index 1e7d05f..b0d8cd6 100755
--- 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}"
@@ -42,7 +46,7 @@ url_umatrix="https://github.com/gorhill/uMatrix/releases/download/${umatrix_vers
 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.1pre3355"
 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