diff options
-rw-r--r-- | kiki.hs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -874,7 +874,7 @@ kiki "show" args = do | |||
874 | 874 | ||
875 | kiki "merge" [] = do | 875 | kiki "merge" [] = do |
876 | putStr . unlines $ | 876 | putStr . unlines $ |
877 | [ "kiki merge [ --passphrase-fd=FD ]" | 877 | [ "kiki merge [ --passphrase-fd=FD ... ]" |
878 | , " ( --home[=HOMEDIR]" | 878 | , " ( --home[=HOMEDIR]" |
879 | , " | --type=(keyring|pem|wallet|hosts)" | 879 | , " | --type=(keyring|pem|wallet|hosts)" |
880 | , " | --access=[auto|secret|public]" | 880 | , " | --access=[auto|secret|public]" |
@@ -965,7 +965,7 @@ kiki "merge" args = do | |||
965 | where | 965 | where |
966 | pfd = FileDesc (read pass) | 966 | pfd = FileDesc (read pass) |
967 | 967 | ||
968 | buildOp (False,(flow,op)) fname = (False,doFile flow op fname) | 968 | buildOp (False,(flow,op)) fname = (False,doFile flow op fname) |
969 | buildOp (True,(flow,op)) arg@(splitArg->parsed) = | 969 | buildOp (True,(flow,op)) arg@(splitArg->parsed) = |
970 | case parsed of | 970 | case parsed of |
971 | Left ("",Nothing) -> (False,(flow,op)) | 971 | Left ("",Nothing) -> (False,(flow,op)) |