Find agent-socket in new location.

1 files changed, 10 insertions, 3 deletions

diff --git a/kiki.hs b/kiki.hs
index ddfb05b..d59f75b 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -23,6 +23,7 @@ import Data.Maybe
 import Data.OpenPGP
 import Data.Ord
 import Data.String
+import Text.Show.Pretty as PP ( ppShow )
 import Data.Text.Encoding
 import System.Posix.Files
 import Foreign.C.Types (CTime(..))
@@ -1309,6 +1310,8 @@ kiki "merge" [] = do
         , "                     HOMEDIR/{secring.gpg,pubring.gpg}"
         , "                   HOMEDIR defaults to your GnuPG home directory."
         , ""
+        , "  --agent          Use gpg-agent."
+        , ""
         , "  FILE             A path to a key file to read or update."
         , ""
         , "MODIFIERS"
@@ -1335,15 +1338,19 @@ kiki "merge" args | "--help" `elem` args = do
     kiki "merge" []
     -- TODO: more help
 kiki "merge" args = do
-    hPutStrLn stderr $ show op
-    KikiResult rt report <- runKeyRing op
+    hPutStrLn stderr $ ppShow op
+    KikiResult rt report <- runKeyRing (mbAgent op)
     case rt of
       KikiSuccess rt -> return ()
       err            -> putStrLn $ errorString err
     forM_ report $ \(fname,act) -> do
         putStrLn $ fname ++ ": " ++ reportString act
  where
-    (_,(_,op)) = foldl' buildOp (True,(flow0,noop)) args
+    (_,(_,op)) = foldl' buildOp (True,(flow0,noop)) args'
+    (args',mbAgent) = case break (=="--agent") args of
+                       (as,[])   -> (args, id)
+                       (as,_:bs) -> ( as++bs
+                                    , \op -> op { opPassphrases = withAgent (opPassphrases op) })
     noop = KeyRingOperation
             { opFiles = Map.empty
             , opTransforms = []