diff options
Diffstat (limited to 'kiki.hs')
-rw-r--r-- | kiki.hs | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -1568,8 +1568,9 @@ kiki "init" args | "--help" `elem` args = do | |||
1568 | putStr . unlines $ | 1568 | putStr . unlines $ |
1569 | [ "kiki init [ --passphrase-fd=FD" | 1569 | [ "kiki init [ --passphrase-fd=FD" |
1570 | , " | --homedir[=HOMEDIR]" | 1570 | , " | --homedir[=HOMEDIR]" |
1571 | , " | --chroot=ROOTDIR ]" | 1571 | , " | --chroot=ROOTDIR" |
1572 | , " | --cipher="++intercalate "|" (map ciphername ciphers)++" ] ..." | 1572 | , " | --cipher="++intercalate "|" (map ciphername ciphers) |
1573 | , " | -(4|5) ] ..." | ||
1573 | , "" | 1574 | , "" |
1574 | , "Modify your GnuPG keyring and update /var/cache/kiki. The following" | 1575 | , "Modify your GnuPG keyring and update /var/cache/kiki. The following" |
1575 | , "changes will occur to the keyring:" | 1576 | , "changes will occur to the keyring:" |
@@ -1589,10 +1590,16 @@ kiki "init" args | "--help" `elem` args = do | |||
1589 | , " variable is ignored and you must use --homedir to specify" | 1590 | , " variable is ignored and you must use --homedir to specify" |
1590 | , " a value other than /root/.gnupg." | 1591 | , " a value other than /root/.gnupg." |
1591 | , "" | 1592 | , "" |
1593 | , " -4" | ||
1594 | , " New PGP key packets should use the v4 (default) format." | ||
1595 | , "" | ||
1596 | , " -5" | ||
1597 | , " New PGP key packets should use the v5 format and use the" | ||
1598 | , " SHA256-based v5 fingerprints." | ||
1592 | , "" | 1599 | , "" |
1593 | ] ++ documentHomeDir ++ [""] ++ documentPassphraseFDFlag True True True | 1600 | ] ++ documentHomeDir ++ [""] ++ documentPassphraseFDFlag True True True |
1594 | 1601 | ||
1595 | kiki "init" args = run args $ importAndRefresh <$> dashdashChroot <*> dashdashHomedir <*> dashdashCipher | 1602 | kiki "init" args = run args $ importAndRefresh <$> dashdashPGPVersion <*> dashdashChroot <*> dashdashHomedir <*> dashdashCipher |
1596 | kiki "spawn" args | "--help" `elem` args = | 1603 | kiki "spawn" args | "--help" `elem` args = |
1597 | putStr . unlines $ | 1604 | putStr . unlines $ |
1598 | [ "kiki spawn [ --passphrase-fd=FD" | 1605 | [ "kiki spawn [ --passphrase-fd=FD" |