瀏覽代碼

Setup gpg-agent before creating keys

Bob Mottram 7 年之前
父節點
當前提交
55c76ed6f6
共有 1 個檔案被更改,包括 3 行新增2 行删除
  1. 3
    2
      src/freedombone-base-email

+ 3
- 2
src/freedombone-base-email 查看文件

1396
 
1396
 
1397
     sed -i "s|keyserver hkp://keys.gnupg.net|keyserver $GPG_KEYSERVER|g" $gpg_dir/gpg.conf
1397
     sed -i "s|keyserver hkp://keys.gnupg.net|keyserver $GPG_KEYSERVER|g" $gpg_dir/gpg.conf
1398
 
1398
 
1399
+    gpg_agent_setup root
1400
+    gpg_agent_setup $MY_USERNAME
1401
+
1399
     if ! grep -q "# default preferences" $gpg_dir/gpg.conf; then
1402
     if ! grep -q "# default preferences" $gpg_dir/gpg.conf; then
1400
         echo '' >> $gpg_dir/gpg.conf
1403
         echo '' >> $gpg_dir/gpg.conf
1401
         echo '# default preferences' >> $gpg_dir/gpg.conf
1404
         echo '# default preferences' >> $gpg_dir/gpg.conf
1456
         chmod 700 /root/.gnupg
1459
         chmod 700 /root/.gnupg
1457
         chmod 600 /root/.gnupg/*
1460
         chmod 600 /root/.gnupg/*
1458
     fi
1461
     fi
1459
-    gpg_agent_setup root
1460
-    gpg_agent_setup $MY_USERNAME
1461
 
1462
 
1462
     mark_completed $FUNCNAME
1463
     mark_completed $FUNCNAME
1463
 }
1464
 }