X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_desktop.sh;h=16074f54fd564f82980a81c72d49e2fdc558e261;hb=aefc1d35df17e586ed35626ab11ffbd7ccc24840;hp=04f49cf3ee605e11126bc19eeefe2e9cd17ddf97;hpb=5d9b221a50f08e13ee43089baec396536fe8e4d7;p=config

diff --git a/buster/setup_scripts/setup_desktop.sh b/buster/setup_scripts/setup_desktop.sh
index 04f49cf..16074f5 100755
--- a/buster/setup_scripts/setup_desktop.sh
+++ b/buster/setup_scripts/setup_desktop.sh
@@ -5,7 +5,7 @@ if [ "$#" -ne 1 ]; then
     echo 'Need exactly one argument (system name).'
     false
 fi
-if [ ! "$1" = "eeepc" ] && [ ! "$1" = "x200s" ]; then
+if [ ! "$1" = "eeepc" ] && [ ! "$1" = "x200s" ] && [ ! "$1" = "w530" ]; then
     echo "Need legal system name."
     false
 fi
@@ -15,12 +15,26 @@ 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}"
+if [ "$1" = "x200s" ] || [ "$1" = "w530" ]; then
+  ./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" thinkpad
+fi
+# TODO: these /should/ redundant, try out without them:
+#./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" user desktop "${system_name}"
+#./install_for_target.sh user desktop "${system_name}"
+
+# For hibernation on lid switch to work, we need a newer kernel on the EeePC,
+# see <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919227>.
+if [ "${system_name}" = "eeepc" ]; then
+    apt -y install -t buster-backports linux-image-amd64
+fi
+
+# 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.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 +51,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.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 +70,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