1 files changed, 16 insertions, 8 deletions

diff --git a/kiki.hs b/kiki.hs
index 555ca92..e551dbd 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -688,7 +688,7 @@ parseKeySpecs = map $ \specfile -> do
     Just (spec,file,cmd)
 
 --kiki :: (Eq a, Data.String.IsString a) => a -> [String] -> IO ()
-sync bExport bSecret cmdarg args_raw = do
+sync bExport bImport bSecret cmdarg args_raw = do
     let (sargs,margs) = processArgs sargspec polyVariadicArgs "--keyrings" args_raw
         sargspec = [ ("--import",0)
                    , ("--autosign",0)
@@ -751,8 +751,8 @@ sync bExport bSecret cmdarg args_raw = do
                                     return guardAuthentic
         kikiOp = KeyRingOperation
             { kFiles = Map.fromList $
-                [ ( HomeSec, (if bSecret then MutableRef Nothing else ConstRef, KeyRingFile passfd)  )
-                , ( HomePub, (MutableRef Nothing, KeyRingFile Nothing) )
+                [ ( HomeSec, (if bSecret && bImport then MutableRef Nothing else ConstRef, KeyRingFile passfd)  )
+                , ( HomePub, (if bImport then MutableRef Nothing else ConstRef, KeyRingFile Nothing) )
                 ]
                 ++ rings
                 ++ if bSecret then pems else []
@@ -786,20 +786,26 @@ sync bExport bSecret cmdarg args_raw = do
         putStrLn $ fname ++ ": " ++ reportString act
 
 kiki "sync-secret" args_raw =
-    sync True True "sync-secret" args_raw
+    sync True True True "sync-secret" args_raw
 
 kiki "sync-public" args_raw =
-    sync True False "sync-public" args_raw
+    sync True True False "sync-public" args_raw
 
 kiki "import-secret" args_raw =
-    sync False True "import-secret" args_raw
+    sync False True True "import-secret" args_raw
 
 kiki "import-public" args_raw =
-    sync False False "import-public" args_raw
+    sync False True False "import-public" args_raw
+
+kiki "export-secret" args_raw =
+    sync True False True "export-secret" args_raw
+
+kiki "export-public" args_raw =
+    sync True False False "export-public" args_raw
 
 kiki "working-key" args = do
     if "--help" `notElem` args
-        then sync False False "working-key" ["--show-wk"]
+        then sync False False False "working-key" ["--show-wk"]
         else putStrLn $
             unlines ["working-key"
                     ,""
@@ -833,6 +839,8 @@ commands =
  , ( "sync-public", "update key files of various kinds by propogating public information" )
  , ( "import-secret", "import (both public and secret) information into your keyring" )
  , ( "import-public", "import (public) information into your keyring" )
+ , ( "export-secret", "export (both public and secret) information into your keyring" )
+ , ( "export-public", "import (public) information into your keyring" )
  , ( "working-key", "show the current working master key and its subkeys" )
  ]