Remove secrets script, enhance secrets setup scripting elsewhere.

[config] / buster / setup_scripts / setup_eeepc.sh

diff --git a/buster/setup_scripts/setup_eeepc.sh b/buster/setup_scripts/setup_eeepc.sh
index 7b0323e80cf749ddfb02a63982c038cf5dff68e5..9e394ebde9942c412aa1a5df800e3bde6caccfdd 100755 (executable)
--- a/buster/setup_scripts/setup_eeepc.sh
+++ b/buster/setup_scripts/setup_eeepc.sh
@@ -43,14 +43,26 @@ mv "${tridactyl_xpi}" "${name}.xpi"
 mv *.xpi "${extensions_dir}"
 
 # Set up user environments.
+secrets_dev="sdb"
+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
-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
-    su -c "curl -fsSl https://raw.githubusercontent.com/tridactyl/tridactyl/78e662efefd1f4af2bdb2a53edecf03b535b997b/native/install.sh | bash" plom
-    passwd plom
-    echo "As tridactyl user, don't forget to do :source on the first Firefox run and then re-start."
+HOME_DIR_EXISTS=$([ ! -d "/home/plom" ]; echo $?)
+adduser --disabled-password --gecos "" plom
+usermod -a -G sudo plom
+passwd plom
+if [ "${HOME_DIR_EXISTS}" -eq 0 ]; then
+    while [ ! -e /dev/"${secrets_dev}" ]; do
+        echo "Put secrets drive into slot for /dev/${secrets_dev}, then hit Return."
+        read ignore
+    done
+    pmount /dev/"${secrets_dev}"
+    cp -a "${source_dir_secrets}" "${target_dir_secrets}"
+    chown -R plom:plom "${target_dir_secrets}"
+    pumount "${secrets_dev}"
+    echo "You can remove /dev/${secrets_dev} now."
+    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