Import GPG keys, run notmuch new.

[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 9b78394f69dbdf93d20557df0f82f313dd5efb6a..1b54a5682a9dd1fe39d113732db5911ddb8c5daa 100755 (executable)
--- a/buster/setup_scripts/setup_home_eeepc.sh
+++ b/buster/setup_scripts/setup_home_eeepc.sh
@@ -11,7 +11,8 @@ 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() {
     repo_name="${1}"
@@ -39,11 +40,13 @@ cp id_rsa ~/.ssh
 stty -echo
 ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub
 stty echo
+gpg --import secret_keys.asc
 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}"
@@ -72,9 +75,10 @@ done
 # Set up e-mail system. Note that we only do mbsync if the imap pass file
 # 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 ~/Mail/maildir  # expected by mbsync/isync
-if [ -f "~/${imap_pass_file}" ]; then
+mkdir -p "${maildir}"  # expected by mbsync/isync
+if [ -f "${HOME}/${authinfo_file}" ]; then
     mbsync -a
+    notmuch new
 fi
 
 # Final note on how to integrate tridactyl.