commit e9b2d2e346b0edda3175db4728d7f6ee05f21da4 parent 20e2f91f5f5ce52448bad934792bc6701bf58ac1 Author: Jaromil <jaromil@dyne.org> Date: Tue, 24 May 2016 21:07:31 +0200 Merge pull request #22 from parazyd/master do not re-encrypt passwordstore if already done Diffstat:
M | src/zlibs/filters | | | 13 | ++++++++----- |
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/zlibs/filters b/src/zlibs/filters @@ -493,11 +493,14 @@ update_mutt() { rm -f "$MAILDIRS/.mutt"/rc gpgkey="" - # detect the default gpg key to always encrypt also to self - [[ -r $HOME/.gnupg/gpg.conf ]] && { - gpgkey=`awk '/^default-key/ { print $2 }' $HOME/.gnupg/gpg.conf` - act "default GPG key configured: $gpgkey" - } + [[ -f $MAILDIRS/.pass/.gpg-id ]] || { + # detect the default gpg key to always encrypt also to self + # update: do not re-encrypt if already done + [[ -r $HOME/.gnupg/gpg.conf ]] && { + gpgkey=`awk '/^default-key/ { print $2 }' $HOME/.gnupg/gpg.conf` + act "default GPG key configured: $gpgkey" + } + } cat<<EOF > "$MAILDIRS/.mutt"/rc #### Mutt config automatically generated by Jaro Mail ### do not edit: this file is overwritten by jaro update