Added rings and wallets to kFiles map

1 files changed, 9 insertions, 2 deletions

diff --git a/kiki.hs b/kiki.hs
index 42b1d98..9f6962f 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1232,10 +1232,11 @@ main = do
     let keypairs = catMaybes keypairs0
         btcpairs = catMaybes btcpairs0
 
-    putStrLn $ "keypairs = "++show keypairs
     {-
+    putStrLn $ "wallets = "++show wallets
+    putStrLn $ "keypairs = "++show keypairs
+    putStrLn $ "keyrings = "++show keyrings_
     putStrLn $ "publics  = "++show publics
-    putStrLn $ "keyrings = "++show keyrings
     -}
 
     let auto_sign_feature rt = do
@@ -1329,12 +1330,18 @@ main = do
                 $ \(usage,path,cmd) ->
                     let cmd' = guard (not $ null cmd) >> return cmd
                     in (ArgFile path, (MutableRef cmd', PEMFile usage)) 
+        walts = map (\fname -> (ArgFile fname, (MutableRef Nothing, WalletFile)))
+                    wallets
+        rings = map (\fname -> (ArgFile fname, (MutableRef Nothing, KeyRingFile passfd)))
+                    keyrings_
         kikiOp = KeyRingData
             { kFiles = Map.fromList $
                 [ ( HomeSec, (MutableRef Nothing, KeyRingFile passfd)  )
                 , ( HomePub, (MutableRef Nothing, KeyRingFile Nothing) )
                 ]
+                ++ rings
                 ++ pems
+                ++ walts
             , kImports = Map.empty
             , homeSpec = homespec
             }