From 9baaf54aa426416e23fe79dee1d6812d1635f9a2 Mon Sep 17 00:00:00 2001
From: joe <joe@jerkface.net>
Date: Sun, 24 Apr 2016 02:37:30 -0400
Subject: Removed unimplemnted feature from doc, and warned about unimplemented
 trust-check.

---
 kiki.hs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'kiki.hs')

diff --git a/kiki.hs b/kiki.hs
index f939fa4..865e551 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1570,6 +1570,9 @@ kiki "init-key" args = do
         _ -> unconditionally $ return rt
 
     -- Finally, export public keys if they do not exist.
+    let writeFileWARNING fname bs = do
+        --TODO
+        hPutStrLn stderr $ fname ++ ": DID NOT CHECK TRUST (TODO)"
     flip (maybe $ warn "missing working key?") (rtGrip rt) $ \grip -> do
     gotc <- doesFileExist (sshcpathpub)
     when (not gotc) $ do
@@ -1603,7 +1606,7 @@ kiki "init-key" args = do
             flip (maybe $ return ()) mbk $ \k -> do
             goti <- doesFileExist (cpath)
             when (not goti) $ do
-                either warn (writeFile $ cpath)
+                either warn (writeFileWARNING $ cpath)
                     $ pemFromPacket k
 
     mapM_ installConctact cs
@@ -1640,15 +1643,13 @@ kiki "delete" args = do
 
 kiki "tar" args | "--help" `elem` args = do
     putStr . unlines $
-        [ "kiki tar (-c|-A|-t) [--secrets SPEC] [--passphrase-fd FD] [--homedir HOMEDIR]"
+        [ "kiki tar (-c|-t) [--secrets SPEC] [--passphrase-fd FD] [--homedir HOMEDIR]"
         , ""
         , "Import or export a tar archive containing key files in the proper"
         , "format for software configuration."
         , ""
         ,"    -c  Generate tar archive on stdout."
         ,""
-        ,"    -A  Read tar archive on stdin."
-        ,""
         ,"    -t  List filepaths that would be included in the (-c) output archive."
         ,""
         ,"    --secrets SPEC"
@@ -1675,15 +1676,14 @@ kiki "tar" args | "--help" `elem` args = do
 
 kiki "tar" args = do
     let parsed_args = processArgs sargspec [] "" args
-        sargspec = [("-t",0),("-c",0),("-A",0),("-C",1),("--secrets",1)]
+        sargspec = [("-t",0),("-c",0),("--secrets",1)]
         ismode ("-t":_) = True
         ismode ("-c":_) = True
-        ismode ("-A":_) = True
         ismode _        = False
     case filter ismode (fst parsed_args) of
         ["-t":_] -> tarT parsed_args
         ["-c":_] -> tarC parsed_args
-        ["-A":_] -> putStrLn "unimplemented."
+        ["-A":_] -> putStrLn "unimplemented." -- import tar file?
         _ -> kiki "tar" ["--help"]
 
 tarContent rt spec pubpem knownhosts secpem = ipsecs ++ sshs ++ secrets "root"
-- 
cgit v1.2.3