Browse Source

Change muttrc to use imported gpg key ID

Bob Mottram 7 years ago
parent
commit
7c2df014a2
1 changed files with 5 additions and 2 deletions
  1. 5
    2
      src/freedombone-utils-keys

+ 5
- 2
src/freedombone-utils-keys View File

95
                 exit 725729
95
                 exit 725729
96
             fi
96
             fi
97
             CURR_EMAIL_ADDRESS=$USER@$HOSTNAME
97
             CURR_EMAIL_ADDRESS=$USER@$HOSTNAME
98
-            CURR_GPG_ID=$(gpg --list-keys $MY_EMAIL_ADDRESS | sed -n '2p' | sed 's/^[ \t]*//')
99
-            CURR_GPG_BACKUP_ID=$(gpg --list-keys "(backup key)" | sed -n '2p' | sed 's/^[ \t]*//')
98
+            CURR_GPG_ID=$(gpg --homedir=$HOME_DIR/.gnupg --list-keys $CURR_EMAIL_ADDRESS | sed -n '2p' | sed 's/^[ \t]*//')
99
+            CURR_GPG_BACKUP_ID=$(gpg --homedir=$HOME_DIR/.gnupg --list-keys "(backup key)" | sed -n '2p' | sed 's/^[ \t]*//')
100
 
100
 
101
             echo $'Making backup copy of existing gpg keys'
101
             echo $'Making backup copy of existing gpg keys'
102
             if [ -d $HOME_DIR/.gnupg ]; then
102
             if [ -d $HOME_DIR/.gnupg ]; then
117
             if [ -d $HOME_DIR/.gnupg ]; then
117
             if [ -d $HOME_DIR/.gnupg ]; then
118
                 echo $'Setting permissions'
118
                 echo $'Setting permissions'
119
                 gpg_set_permissions $MY_USERNAME
119
                 gpg_set_permissions $MY_USERNAME
120
+                echo $"Updating muttrc for $MY_USERNAME"
121
+                CURR_GPG_ID=$(gpg --homedir=$HOME_DIR/.gnupg --list-keys $CURR_EMAIL_ADDRESS | sed -n '2p' | sed 's/^[ \t]*//')
122
+                sed -i "s|set pgp_encrypt_only_command.*|set pgp_encrypt_only_command=\"/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --trust-model always --encrypt-to $CURR_GPG_ID -- -r %r -- %f\"|g" /home/$MY_USERNAME/.muttrc
120
             fi
123
             fi
121
             GPG_LOADING="no"
124
             GPG_LOADING="no"
122
             dialog --title $"Recover Encryption Keys" \
125
             dialog --title $"Recover Encryption Keys" \