From 08787650f5d99bb9110bb9d7ef92ac249be865ad Mon Sep 17 00:00:00 2001 From: joe Date: Tue, 6 May 2014 02:30:44 -0400 Subject: update usage to reflect multiple passphrases are suported --- kiki.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kiki.hs b/kiki.hs index c84bce2..3bc291f 100644 --- a/kiki.hs +++ b/kiki.hs @@ -874,7 +874,7 @@ kiki "show" args = do kiki "merge" [] = do putStr . unlines $ - [ "kiki merge [ --passphrase-fd=FD ]" + [ "kiki merge [ --passphrase-fd=FD ... ]" , " ( --home[=HOMEDIR]" , " | --type=(keyring|pem|wallet|hosts)" , " | --access=[auto|secret|public]" @@ -965,7 +965,7 @@ kiki "merge" args = do where pfd = FileDesc (read pass) - buildOp (False,(flow,op)) fname = (False,doFile flow op fname) + buildOp (False,(flow,op)) fname = (False,doFile flow op fname) buildOp (True,(flow,op)) arg@(splitArg->parsed) = case parsed of Left ("",Nothing) -> (False,(flow,op)) -- cgit v1.2.3