Fix home directory existence test

[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..e5aa7078fece68e11d8eb9c59214dbe03d32ff3a 100755 (executable)
--- a/buster/setup_scripts/setup_desktop.sh
+++ b/buster/setup_scripts/setup_desktop.sh
@@ -37,7 +37,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 +56,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