X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_desktop.sh;h=f2d35ff9c994a36605400045464a7f8aad9c740e;hb=535a739436b7e7dc2d545a4100aeb7efa0e4354c;hp=04f49cf3ee605e11126bc19eeefe2e9cd17ddf97;hpb=5d9b221a50f08e13ee43089baec396536fe8e4d7;p=config
diff --git a/buster/setup_scripts/setup_desktop.sh b/buster/setup_scripts/setup_desktop.sh
index 04f49cf..f2d35ff 100755
--- a/buster/setup_scripts/setup_desktop.sh
+++ b/buster/setup_scripts/setup_desktop.sh
@@ -19,6 +19,10 @@ 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'
+service cups restart
+
# Install Firefox directly from Mozilla.
firefox_release="68.1.0esr"
firefox_filename="firefox-${firefox_release}.tar.bz2"
@@ -37,7 +41,7 @@ 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)
@@ -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