free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Setup gpg-agent before creating keys

This commit is contained in:
Bob Mottram 2017-09-18 21:15:18 +01:00
parent 98adf1ec5a
commit 55c76ed6f6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/freedombone-base-email
View File

@ -1396,6 +1396,9 @@ function configure_gpg {
sed -i "s|keyserver hkp://keys.gnupg.net|keyserver $GPG_KEYSERVER|g" $gpg_dir/gpg.conf sed -i "s|keyserver hkp://keys.gnupg.net|keyserver $GPG_KEYSERVER|g" $gpg_dir/gpg.conf
gpg_agent_setup root
gpg_agent_setup $MY_USERNAME
if ! grep -q "# default preferences" $gpg_dir/gpg.conf; then if ! grep -q "# default preferences" $gpg_dir/gpg.conf; then
echo '' >> $gpg_dir/gpg.conf echo '' >> $gpg_dir/gpg.conf
echo '# default preferences' >> $gpg_dir/gpg.conf echo '# default preferences' >> $gpg_dir/gpg.conf
@ -1456,8 +1459,6 @@ function configure_gpg {
chmod 700 /root/.gnupg chmod 700 /root/.gnupg
chmod 600 /root/.gnupg/* chmod 600 /root/.gnupg/*
fi fi
gpg_agent_setup root
gpg_agent_setup $MY_USERNAME
mark_completed $FUNCNAME mark_completed $FUNCNAME
} }