Basic gpg-agent support.

1 files changed, 6 insertions, 6 deletions

diff --git a/kiki.hs b/kiki.hs
index a0eff1a..71222ce 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1146,8 +1146,8 @@ sync bExport bImport bSecret cmdarg args_raw = do
                 ++ pems
                 ++ if bSecret then walts else []
                 ++ hosts
-            , opPassphrases = do pfile <- maybeToList passfd
-                                 return $ PassphraseSpec Nothing Nothing pfile
+            , opPassphrases = withAgent $ do pfile <- maybeToList passfd
+                                             return $ PassphraseSpec Nothing Nothing pfile
             , opTransforms = maybe [] (const [Autosign]) $ Map.lookup "--autosign" margs
             , opHome = homespec
             }
@@ -1252,8 +1252,8 @@ kiki "show" args = do
                 ++ pems
                 ++ walts
                 ++ hosts
-            , opPassphrases = do pfile <- maybeToList passfd
-                                 return $ PassphraseSpec Nothing Nothing pfile
+            , opPassphrases = withAgent $ do pfile <- maybeToList passfd
+                                             return $ PassphraseSpec Nothing Nothing pfile
             , opTransforms = []
             , opHome = homespec
             }
@@ -1537,8 +1537,8 @@ kiki "delete" args = do
                 [ ( HomeSec, buildStreamInfo KF_All KeyRingFile )
                 , ( HomePub, buildStreamInfo KF_All KeyRingFile )
                 ]
-            , opPassphrases = do pfile <- maybeToList passfd
-                                 return $ PassphraseSpec Nothing Nothing pfile
+            , opPassphrases = withAgent $ do pfile <- maybeToList passfd
+                                             return $ PassphraseSpec Nothing Nothing pfile
             , opTransforms = map DeleteSubkeyByFingerprint fps
             , opHome = homespec
             }