X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_home_eeepc.sh;h=1b54a5682a9dd1fe39d113732db5911ddb8c5daa;hb=9cf85bce08b00c254652cfa929ed55ccafa6f8e5;hp=8d675adaa49f3231fe4b0e5bcd94935c234554e4;hpb=667ec8d6e5c9beb7ba10a2a585dc327c6c9c87ad;p=config diff --git a/buster/setup_scripts/setup_home_eeepc.sh b/buster/setup_scripts/setup_home_eeepc.sh index 8d675ad..1b54a56 100755 --- 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 +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}" @@ -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.