diff options
author | joe <joe@jerkface.net> | 2014-04-18 01:15:45 -0400 |
---|---|---|
committer | joe <joe@jerkface.net> | 2014-04-18 01:15:45 -0400 |
commit | 6b13522c93e6efb3b4199f671a6506dec88f9fe9 (patch) | |
tree | 3f73b072127be1b49a8910bc99df02d4f7747ce4 | |
parent | 60f9591a217e07da45b6f16769a9b65a18301754 (diff) |
Added rings and wallets to kFiles map
-rw-r--r-- | kiki.hs | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -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 | } |