diff options
-rw-r--r-- | kiki.hs | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -1243,7 +1243,7 @@ kiki "merge" [] = do | |||
1243 | putStr . unlines $ | 1243 | putStr . unlines $ |
1244 | [ "kiki merge [ --passphrase-fd=FD ... ]" | 1244 | [ "kiki merge [ --passphrase-fd=FD ... ]" |
1245 | , " ( --home[=HOMEDIR]" | 1245 | , " ( --home[=HOMEDIR]" |
1246 | , " | --type=(keyring|pem|wallet|hosts)" | 1246 | , " | --type=(keyring|pem|wallet|hosts|dns)" |
1247 | , " | --access=[auto|secret|public]" | 1247 | , " | --access=[auto|secret|public]" |
1248 | , " | --flow=(fill|spill|sync)[,(subkeys|match=SPEC)]" | 1248 | , " | --flow=(fill|spill|sync)[,(subkeys|match=SPEC)]" |
1249 | , " | --create=CMD" | 1249 | , " | --create=CMD" |
@@ -1359,10 +1359,11 @@ kiki "merge" args = do | |||
1359 | Left ("create",Just cmd) -> | 1359 | Left ("create",Just cmd) -> |
1360 | ( flow { initializer = if null cmd then Nothing else Just cmd } | 1360 | ( flow { initializer = if null cmd then Nothing else Just cmd } |
1361 | , op ) | 1361 | , op ) |
1362 | Left ("type",Just "keyring") -> ( flow { typ = KeyRingFile }, op ) | 1362 | Left ("type",Just "keyring") -> ( flow { typ = KeyRingFile } , op ) |
1363 | Left ("type",Just "pem" ) -> ( flow { typ = PEMFile }, op ) | 1363 | Left ("type",Just "pem" ) -> ( flow { typ = PEMFile } , op ) |
1364 | Left ("type",Just "wallet" ) -> ( flow { typ = WalletFile }, op ) | 1364 | Left ("type",Just "wallet" ) -> ( flow { typ = WalletFile } , op ) |
1365 | Left ("type",Just "hosts" ) -> ( flow { typ = Hosts }, op ) | 1365 | Left ("type",Just "hosts" ) -> ( flow { typ = Hosts } , op ) |
1366 | Left ("type",Just "dns" ) -> ( flow { typ = DNSPresentation } , op ) | ||
1366 | Left ("access",Just "public") -> ( flow { access = Pub }, op ) | 1367 | Left ("access",Just "public") -> ( flow { access = Pub }, op ) |
1367 | Left ("access",Just "secret") -> ( flow { access = Sec }, op ) | 1368 | Left ("access",Just "secret") -> ( flow { access = Sec }, op ) |
1368 | Left ("access",Just "auto") -> ( flow { access = AutoAccess }, op ) | 1369 | Left ("access",Just "auto") -> ( flow { access = AutoAccess }, op ) |