X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=buster%2Fsetup_scripts%2Fsetup_eeepc.sh;h=c4c40251b5b040d46e1bec42ed14a4e9692b1233;hb=7da6716e618d2fa8c010ebe50ed846b10123b178;hp=47b05d0085e80bc025a1c22b00b6c09eed87cd62;hpb=408b30e6324ffc83196dc260cc7bb1b9bc49f74a;p=config
diff --git a/buster/setup_scripts/setup_eeepc.sh b/buster/setup_scripts/setup_eeepc.sh
index 47b05d0..c4c4025 100755
--- a/buster/setup_scripts/setup_eeepc.sh
+++ b/buster/setup_scripts/setup_eeepc.sh
@@ -35,20 +35,39 @@ url_noscript="https://secure.informaction.com/download/releases/${noscript_xpi}"
wget "${url_noscript}"
name=$(unzip -p "${noscript_xpi}" manifest.json | jq -r .applications.gecko.id)
mv "${noscript_xpi}" "${name}.xpi"
-wget "${url_tridactyl}"
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}"
# 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
- passwd plom
+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
+ echo "Put secrets drive into slot for /dev/${secrets_dev}."
+ while [ ! -e /dev/"${secrets_dev}" ]; do
+ sleep 1
+ done
+ stty -echo
+ printf "Secrets passphrase: "
+ read secrets_pass
+ stty echo
+ echo "" # newline so user knows their input return was accepted
+ echo "${secrets_pass}" | 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
+ SECRETS_PASS="${secrets_pass}" su -c "cd && ./setup_home_eeepc.sh" plom
fi