Implemented --passphrase-fd for 'merge' command

1 files changed, 13 insertions, 1 deletions

diff --git a/kiki.hs b/kiki.hs
index 5017b38..c84bce2 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -874,7 +874,8 @@ kiki "show" args = do
 
 kiki "merge" [] = do
     putStr . unlines $
-        [ "kiki merge ( --home[=HOMEDIR]"
+        [ "kiki merge [ --passphrase-fd=FD ]"
+        , "           ( --home[=HOMEDIR]"
         , "           | --type=(keyring|pem|wallet|hosts)"
         , "           | --access=[auto|secret|public]"
         , "           | --flow=(fill|spill|sync)[,(subkeys|match=SPEC)]"
@@ -954,6 +955,16 @@ kiki "merge" args = do
         ( flow { transforms = filter (/=Autosign) (transforms flow) }
         , op { opTransforms = filter (/=Autosign) (opTransforms op) } )
 
+    doPassphrase :: StreamInfo -> KeyRingOperation -> String -> (StreamInfo,KeyRingOperation)
+    doPassphrase flow op pass =
+        if Map.null (opFiles op)
+            then ( flow
+                 , op { opPassphrases = PassphraseSpec Nothing Nothing pfd
+                                        : opPassphrases op } )
+            else error "passphrase-fd must come before any file arguments or --home"
+     where
+        pfd = FileDesc (read pass)
+
     buildOp (False,(flow,op)) fname                 = (False,doFile flow op fname)
     buildOp (True,(flow,op)) arg@(splitArg->parsed) =
         case parsed of
@@ -970,6 +981,7 @@ kiki "merge" args = do
             Left ("autosign",Just "n")    -> doAutosign False flow op
             Left ("autosign",Just "no")   -> doAutosign False flow op
             Left ("autosign",Just "false")-> doAutosign False flow op
+            Left ("passphrase-fd",Just pass) -> doPassphrase flow op pass
             Left ("create",Just cmd) ->
                 ( flow { initializer = if null cmd then Nothing else Just cmd }
                 , op )