summaryrefslogtreecommitdiff
path: root/kiki.hs
diff options
context:
space:
mode:
authorjoe <joe@jerkface.net>2016-08-29 16:58:47 -0400
committerjoe <joe@jerkface.net>2016-08-29 16:58:47 -0400
commit63af3d0f3d149b110e172223c18afacd77a172f8 (patch)
tree0c3620913ab61dcd50afa12df38ac2ced4d6e654 /kiki.hs
parent5c6d9d1a2810eba2772dcdbee255e11144e21176 (diff)
Allow alternative key ciphers.
Diffstat (limited to 'kiki.hs')
-rw-r--r--kiki.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/kiki.hs b/kiki.hs
index 71222ce..f42ee22 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1492,7 +1492,8 @@ kiki "init" args | "--help" `elem` args = do
1492 putStr . unlines $ 1492 putStr . unlines $
1493 [ "kiki init [ --passphrase-fd=FD" 1493 [ "kiki init [ --passphrase-fd=FD"
1494 , " | --homedir[=HOMEDIR]" 1494 , " | --homedir[=HOMEDIR]"
1495 , " | --chroot=ROOTDIR ] ..." 1495 , " | --chroot=ROOTDIR ]"
1496 , " | --cipher="++intercalate "|" (map ciphername ciphers)++" ] ..."
1496 , "" 1497 , ""
1497 , "Modify your GnuPG keyring and update /var/cache/kiki. The following" 1498 , "Modify your GnuPG keyring and update /var/cache/kiki. The following"
1498 , "changes will occur to the keyring:" 1499 , "changes will occur to the keyring:"
@@ -1512,9 +1513,10 @@ kiki "init" args | "--help" `elem` args = do
1512 , " variable is ignored and you must use --homedir to specify" 1513 , " variable is ignored and you must use --homedir to specify"
1513 , " a value other than /root/.gnupg." 1514 , " a value other than /root/.gnupg."
1514 , "" 1515 , ""
1516 , ""
1515 ] ++ documentHomeDir ++ [""] ++ documentPassphraseFDFlag True True True 1517 ] ++ documentHomeDir ++ [""] ++ documentPassphraseFDFlag True True True
1516 1518
1517kiki "init" args = run args $ importAndRefresh <$> ㄧchroot <*> ㄧhomedir 1519kiki "init" args = run args $ importAndRefresh <$> ㄧchroot <*> ㄧhomedir <*> ㄧcipher
1518 1520
1519kiki "delete" args | "--help" `elem` args = do 1521kiki "delete" args | "--help" `elem` args = do
1520 putStr . unlines $ 1522 putStr . unlines $