浏览代码

Fixing broken gpg key search

Bob Mottram 7 年前
父节点
当前提交
00429b3989
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 2
    1
      src/freedombone-base-email
  2. 2
    1
      src/freedombone-utils-backup

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

@@ -1365,7 +1365,8 @@ function configure_gpg {
1365 1365
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
1366 1366
         return
1367 1367
     fi
1368
-    apt-get -yq install gnupg
1368
+    apt-get -yq install gnupg dirmngr
1369
+    printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > ~/.gnupg/S.dirmngr
1369 1370
 
1370 1371
     check_email_address_exists
1371 1372
 

+ 2
- 1
src/freedombone-utils-backup 查看文件

@@ -70,7 +70,8 @@ function configure_backup_key {
70 70
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
71 71
         return
72 72
     fi
73
-    apt-get -yq install gnupg
73
+    apt-get -yq install gnupg dirmngr
74
+    printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > ~/.gnupg/S.dirmngr
74 75
 
75 76
     BACKUP_KEY_EXISTS=$(gpg_key_exists "root" "$MY_NAME (backup key)")
76 77
     if [[ $BACKUP_KEY_EXISTS == "yes" ]]; then