Minor fixes to Firefox setup.

[config] / buster / setup_scripts / setup_home_eeepc.sh

diff --git a/buster/setup_scripts/setup_home_eeepc.sh b/buster/setup_scripts/setup_home_eeepc.sh
index 8d675adaa49f3231fe4b0e5bcd94935c234554e4..6e58ef41f68a71ce429e3aedd0b33c76e4728c23 100755 (executable)
--- a/buster/setup_scripts/setup_home_eeepc.sh
+++ b/buster/setup_scripts/setup_home_eeepc.sh
@@ -11,7 +11,7 @@ dir_secrets="${HOME}/tmp_secrets"
 borgkeys_dir=~/.config/borg/keys
 borgrepos_file=~/.borgrepos
 ssh_dir=~/.ssh
-imap_pass_file=.imap_pass
+authinfo_file=.authinfo
 maildir=~/mail/maildir
 
 ensure_repo() {
@@ -40,11 +40,13 @@ cp id_rsa ~/.ssh
 stty -echo
 ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub
 stty echo
+script -c 'gpg --import secret_keys.asc' /dev/null
 tar xf borg_keyfiles.tar
 mkdir -p "${borgkeys_dir}"
 mv borg_keyfiles/* "${borgkeys_dir}"
-if [ -f "${imap_pass_file}" ]; then
-    cp "${imap_pass_file}" ~
+# .authinfo may not be present on every secrets drive yet
+if [ -f "${authinfo_file}" ]; then
+    cp "${authinfo_file}" ~
 fi
 cd
 rm -rf "${dir_secrets}"
@@ -74,8 +76,9 @@ done
 # is found. It may not be present on every secrets drive yet, so we have to
 # deal with the possibility of it being absent at this point.
 mkdir -p "${maildir}"  # expected by mbsync/isync
-if [ -f "${HOME}/${imap_pass_file}" ]; then
+if [ -f "${HOME}/${authinfo_file}" ]; then
     mbsync -a
+    notmuch new
 fi
 
 # Final note on how to integrate tridactyl.