summaryrefslogtreecommitdiff
path: root/kiki.hs
diff options
context:
space:
mode:
Diffstat (limited to 'kiki.hs')
-rw-r--r--kiki.hs11
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
1232 let keypairs = catMaybes keypairs0 1232 let keypairs = catMaybes keypairs0
1233 btcpairs = catMaybes btcpairs0 1233 btcpairs = catMaybes btcpairs0
1234 1234
1235 putStrLn $ "keypairs = "++show keypairs
1236 {- 1235 {-
1236 putStrLn $ "wallets = "++show wallets
1237 putStrLn $ "keypairs = "++show keypairs
1238 putStrLn $ "keyrings = "++show keyrings_
1237 putStrLn $ "publics = "++show publics 1239 putStrLn $ "publics = "++show publics
1238 putStrLn $ "keyrings = "++show keyrings
1239 -} 1240 -}
1240 1241
1241 let auto_sign_feature rt = do 1242 let auto_sign_feature rt = do
@@ -1329,12 +1330,18 @@ main = do
1329 $ \(usage,path,cmd) -> 1330 $ \(usage,path,cmd) ->
1330 let cmd' = guard (not $ null cmd) >> return cmd 1331 let cmd' = guard (not $ null cmd) >> return cmd
1331 in (ArgFile path, (MutableRef cmd', PEMFile usage)) 1332 in (ArgFile path, (MutableRef cmd', PEMFile usage))
1333 walts = map (\fname -> (ArgFile fname, (MutableRef Nothing, WalletFile)))
1334 wallets
1335 rings = map (\fname -> (ArgFile fname, (MutableRef Nothing, KeyRingFile passfd)))
1336 keyrings_
1332 kikiOp = KeyRingData 1337 kikiOp = KeyRingData
1333 { kFiles = Map.fromList $ 1338 { kFiles = Map.fromList $
1334 [ ( HomeSec, (MutableRef Nothing, KeyRingFile passfd) ) 1339 [ ( HomeSec, (MutableRef Nothing, KeyRingFile passfd) )
1335 , ( HomePub, (MutableRef Nothing, KeyRingFile Nothing) ) 1340 , ( HomePub, (MutableRef Nothing, KeyRingFile Nothing) )
1336 ] 1341 ]
1342 ++ rings
1337 ++ pems 1343 ++ pems
1344 ++ walts
1338 , kImports = Map.empty 1345 , kImports = Map.empty
1339 , homeSpec = homespec 1346 , homeSpec = homespec
1340 } 1347 }