More scripts fixing.

[config] / buster / setup_scripts / setup_eeepc.sh

diff --git a/buster/setup_scripts/setup_eeepc.sh b/buster/setup_scripts/setup_eeepc.sh
index ef378f0477688a06aecd1e510b93a421f70364a7..fa3faeca86917c54bd9ff054e5be0332bcfe44bf 100755 (executable)
--- a/buster/setup_scripts/setup_eeepc.sh
+++ b/buster/setup_scripts/setup_eeepc.sh
@@ -29,6 +29,7 @@ update-alternatives --set x-www-browser /opt/firefox/firefox
 # Install Firefox plugins.
 # See <https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Distribution_options/Sideloading_add-ons>
 extensions_dir="/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/"
+mkdir -p "${extensions_dir}"
 noscript_xpi="noscript-10.6.xpi"
 url_noscript="https://secure.informaction.com/download/releases/${noscript_xpi}"
 wget "${url_noscript}"
@@ -36,6 +37,7 @@ name=$(unzip -p "${noscript_xpi}" manifest.json | jq -r .applications.gecko.id)
 mv "${noscript_xpi}" "${name}.xpi"
 tridactyl_xpi="tridactyl-1.14.9pre2457-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)
 mv "${tridactyl_xpi}" "${name}.xpi"
 mv *.xpi "${extensions_dir}"
@@ -43,10 +45,12 @@ mv *.xpi "${extensions_dir}"
 # Set up user environments.
 cd "${setup_scripts_dir}"
 ./copy_dirtree.sh "${config_tree_prefix}/home_files" "/root" minimal root
-if [ ! -d "/home/plom" ]; then
-    adduser --disabled-password --gecos "" plom
-    usermod -a -G sudo plom
-    su -c "cd && git clone https://plomlompom.com/repos/clone/config" plom
-    su -c "~/config/buster/setup_scripts/copy_dirtree.sh ~/config/buster/home_files ~ minimal user_eeepc" plom
-    passwd plom
+HOME_DIR_EXISTS=$([ ! -d "/home/plom" ]; echo $?)
+adduser --disabled-password --gecos "" plom
+usermod -a -G sudo plom
+if [ "${HOME_DIR_EXISTS}" -eq 0 ]; then
+    cp setup_home_eeepc.sh /home/plom
+    chown plom:plom /home/plom/setup_home_eeepc.sh
+    su -c "cd && ./setup_home_eeepc.sh" plom
 fi
+passwd plom