X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=buster%2Fsetup_scripts%2Fsetup_desktop.sh;h=6ac15233d9e9b33b266e2022743d9da76eaf2654;hb=e66194f3ad72d6ae95176482e9b4715523b98866;hp=3c66ceabef1b4b93e34d2ad736c1ae78866fdcf4;hpb=f8d7547f67a6f96105c3d3d730eaca046ad264da;p=config
diff --git a/buster/setup_scripts/setup_desktop.sh b/buster/setup_scripts/setup_desktop.sh
index 3c66cea..6ac1523 100755
--- a/buster/setup_scripts/setup_desktop.sh
+++ b/buster/setup_scripts/setup_desktop.sh
@@ -15,12 +15,16 @@ system_name="$1"
config_tree_prefix="${HOME}/config/buster"
setup_scripts_dir="${config_tree_prefix}/setup_scripts"
cd "${setup_scripts_dir}"
-./setup.sh "${system_name}" ""
-./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" user "${system_name}"
-./install_for_target.sh user "${system_name}"
+./setup.sh "${system_name}" "" user desktop "${system_name}"
+./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" user desktop "${system_name}"
+./install_for_target.sh user desktop "${system_name}"
+
+# Set up printer.
+lpadmin -p 'HP_Deskjet_F300_series' -m 'drv:///hpcups.drv/hp-deskjet_f300_series.ppd' -o 'OutputMode=NormalGray' -E
+service cups restart
# Install Firefox directly from Mozilla.
-firefox_release="68.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}"
@@ -36,17 +40,14 @@ update-alternatives --set x-www-browser /opt/firefox/firefox
# See
extensions_dir="/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/"
mkdir -p "${extensions_dir}"
-umatrix_xpi="uMatrix.firefox.signed.xpi"
-url_umatrix="https://github.com/gorhill/uMatrix/releases/download/1.3.17rc4/${umatrix_xpi}"
+umatrix_version="1.4.0"
+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
-#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.17.1pre3355"
+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)
@@ -59,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