summaryrefslogtreecommitdiff
path: root/kiki.hs
diff options
context:
space:
mode:
authorJames Crayne <jim.crayne@gmail.com>2014-04-27 01:11:01 -0400
committerJames Crayne <jim.crayne@gmail.com>2014-04-27 01:11:01 -0400
commit5600972da9e24436985f520fadc4f74bf6fe60b5 (patch)
tree7e5ed4484bc1aabc7ab24230dee64bf91cf9af93 /kiki.hs
parent278e30eb03b821c9ce9502eb3879ef728367dde8 (diff)
More complete help
Diffstat (limited to 'kiki.hs')
-rw-r--r--kiki.hs64
1 files changed, 61 insertions, 3 deletions
diff --git a/kiki.hs b/kiki.hs
index f5716f0..f5e3863 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -509,7 +509,7 @@ kiki_usage bSecret cmd = putStr $
509 ," uses the database to update all the input files, those inside and outside of" 509 ," uses the database to update all the input files, those inside and outside of"
510 ," of the home directory (see --homedir), to have the most complete information." 510 ," of the home directory (see --homedir), to have the most complete information."
511 ,"" 511 ,""
512 ," The files pubring.gpg and subring.gpg in the directory specified by the " 512 ," The files pubring.gpg and secring.gpg in the directory specified by the "
513 ," --homedir option are implicitly included in the keyring set." 513 ," --homedir option are implicitly included in the keyring set."
514 ,"" 514 ,""
515 ," Subkeys that are imported with kiki are given an annotation \"usage@\" which" 515 ," Subkeys that are imported with kiki are given an annotation \"usage@\" which"
@@ -517,13 +517,32 @@ kiki_usage bSecret cmd = putStr $
517 ," particular key. Master keys may be specified by using fingerprints or by" 517 ," particular key. Master keys may be specified by using fingerprints or by"
518 ," specifying a substring of an associated UID." 518 ," specifying a substring of an associated UID."
519 ] ++ syncflags ++ keyspec 519 ] ++ syncflags ++ keyspec
520 "sync-public" -> unlines $
521 ["kiki sync-public [options...]"
522 ,""
523 ," sync-public merges a set of key files into a combined database and then"
524 ," uses the database to update all the input files, those inside and outside of"
525 ," of the home directory (see --homedir), to have the most complete information."
526 ,""
527 ," The files pubring.gpg and secring.gpg in the directory specified by the "
528 ," --homedir option are implicitly included in the keyring set. However, the"
529 ," difference betwen this command and sync-secret is that no secret keys are"
530 ," modified by this command regardless of input. Export of secret keys is"
531 ," possible using this command, but will only occur if the secret master key"
532 ," is already in the external file. (TODO, remove this capacity entirely)"
533 ,""
534 ," Subkeys that are imported with kiki are given an annotation \"usage@\" which"
535 ," indicates what the key is for. This tag can be used as a SPEC to select a"
536 ," particular key. Master keys may be specified by using fingerprints or by"
537 ," specifying a substring of an associated UID."
538 ] ++ syncflags ++ keyspec
520 "import-secret" -> unlines $ 539 "import-secret" -> unlines $
521 ["kiki import-secret [options...]" 540 ["kiki import-secret [options...]"
522 ,"" 541 ,""
523 ," import-secret uses a set of key files to update your keyring. It does not" 542 ," import-secret uses a set of key files to update your keyring. It does not"
524 ," alter any files outside of the home directory (see --homedir)." 543 ," alter any files outside of the home directory (see --homedir)."
525 ,"" 544 ,""
526 ," The files pubring.gpg and subring.gpg in the directory specified by the " 545 ," The files pubring.gpg and secring.gpg in the directory specified by the "
527 ," --homedir option are implicitly included in the keyring set." 546 ," --homedir option are implicitly included in the keyring set."
528 ,"" 547 ,""
529 ," Subkeys that are imported with kiki are given an annotation \"usage@\" which" 548 ," Subkeys that are imported with kiki are given an annotation \"usage@\" which"
@@ -531,6 +550,45 @@ kiki_usage bSecret cmd = putStr $
531 ," particular key. Master keys may be specified by using fingerprints or by" 550 ," particular key. Master keys may be specified by using fingerprints or by"
532 ," specifying a substring of an associated UID." 551 ," specifying a substring of an associated UID."
533 ] ++ syncflags ++ keyspec 552 ] ++ syncflags ++ keyspec
553 "import-public" -> unlines $
554 ["kiki import-public [options...]"
555 ,""
556 ," import-public uses a set of key files to update your keyring. It does not"
557 ," alter any files outside of the home directory (see --homedir). Nor does it"
558 ," alter your secring.gpg file."
559 ,""
560 ," The files pubring.gpg and secring.gpg in the directory specified by the "
561 ," --homedir option are implicitly included in the keyring set. However, the"
562 ," difference betwen this command and import-secret is that no secret keys are"
563 ," modified by this command regardless of input. Export of secret keys is"
564 ," possible using this command, but will only occur if the secret master key"
565 ," is already in the external file. (TODO, remove this capacity entirely)"
566 ,""
567 ," Subkeys that are imported with kiki are given an annotation \"usage@\" which"
568 ," indicates what the key is for. This tag can be used as a SPEC to select a"
569 ," particular key. Master keys may be specified by using fingerprints or by"
570 ," specifying a substring of an associated UID."
571 ] ++ syncflags ++ keyspec
572 "export-secret" -> unlines $
573 ["kiki export-secret [options...]"
574 ,""
575 ," export-secret updates a set of key files using information from your keyring."
576 ,""
577 ," The files pubring.gpg and secring.gpg in the directory specified by the "
578 ," --homedir option are implicitly included in the keyring set."
579 ,""
580 ] ++ syncflags ++ keyspec
581 "export-public" -> unlines $
582 ["kiki export-public [options...]"
583 ,""
584 ," export-public updates a set of key files using information from your keyring."
585 ,""
586 ," The files pubring.gpg and secring.gpg in the directory specified by the "
587 ," --homedir option are implicitly included in the keyring set. However, the"
588 ," difference betwen this command and export-secret is that no secret keys are"
589 ," exported by this command regardless of input."
590 ,""
591 ] ++ syncflags ++ keyspec
534 where 592 where
535 commonOptions :: [String] 593 commonOptions :: [String]
536 commonOptions = 594 commonOptions =
@@ -776,7 +834,7 @@ sync bExport bImport bSecret cmdarg args_raw = do
776 return guardAuthentic 834 return guardAuthentic
777 kikiOp = KeyRingOperation 835 kikiOp = KeyRingOperation
778 { kFiles = Map.fromList $ 836 { kFiles = Map.fromList $
779 [ ( HomeSec, (if bSecret && bImport then MutableRef Nothing else ConstRef, KeyRingFile passfd) ) 837 [ ( HomeSec, (if bSecret && bImport then MutableRef Nothing else ConstRef, KeyRingFile passfd) )
780 , ( HomePub, (if bImport then MutableRef Nothing else ConstRef, KeyRingFile Nothing) ) 838 , ( HomePub, (if bImport then MutableRef Nothing else ConstRef, KeyRingFile Nothing) )
781 ] 839 ]
782 ++ rings 840 ++ rings