From 73bde742f0f452da91eb2dd9de9a954fc33c28a8 Mon Sep 17 00:00:00 2001 From: joe Date: Wed, 24 Jun 2015 14:14:09 -0400 Subject: minor documentation tweak --- kiki.hs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/kiki.hs b/kiki.hs index 000dfa2..0c38343 100644 --- a/kiki.hs +++ b/kiki.hs @@ -177,7 +177,7 @@ listKeysFiltered grips pkts = do , formkind , " " , fingerprint sub - , " " ++ (torhash sub) + -- , " " ++ (torhash sub) -- , " " ++ (concatMap (printf "%02X") $ S.unpack (ecc_curve sub)) ] -- ++ ppShow hashed : if isCryptoCoinKey sub @@ -522,7 +522,7 @@ kiki_usage bExport bImport bSecret cmd = putStr $ ," sync-secret works by first creating a combined database containing all information" ," and then updating all files (including OpenGPG files, as well as files specified as" ," arguments to the options --keyrings, --wallets, and --hosts) with information from" - ," from the combined database." + ," from that combined database." ,"" ," Master keys in keyring files are fleshed out with all known subkeys" ," in any file in which they appear. Ordinarily, if a file does not contain the master key" @@ -959,13 +959,14 @@ buildStreamInfo rtyp ftyp = StreamInfo { typ = ftyp , transforms = [] } +-- Flag-specific options +-- bSecret: --keypairs and --wallets +-- bImport: --import and --import-if-authentic sync :: Bool -> Bool -> Bool -> String -> [String] -> IO () sync bExport bImport bSecret cmdarg args_raw = do let (sargs,margs) = processArgs sargspec polyVariadicArgs "--keyrings" args_raw - sargspec = [ ("--import",0) + sargspec = [ ("--show-wk",0) , ("--autosign",0) - , ("--import-if-authentic",0) - , ("--show-wk",0) {-, ("--show-all",0) , ("--show-whose-key",0) , ("--show-key",1) @@ -973,6 +974,8 @@ sync bExport bImport bSecret cmdarg args_raw = do , ("--show-ssh",1) , ("--show-wip",1) -} ] + ++ do guard bImport + [ ("--import",0), ("--import-if-authentic",0) ] polyVariadicArgs = ["--keyrings" ,"--hosts" ] ++ do guard bSecret -- cgit v1.2.3