moved getHomeDir to cross_merge

1 files changed, 6 insertions, 7 deletions

diff --git a/kiki.hs b/kiki.hs
index 9c88f6c..27f49f3 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1305,7 +1305,10 @@ writeOutKeyrings lkmap db = do
         -- warn $ "writing "++f
         L.writeFile f (encode m)
 
-cross_merge doDecrypt grip0 keyrings wallets f = do
+cross_merge doDecrypt homespec keyrings_ wallets f = do
+        (homedir,secring,pubring,grip0) <- getHomeDir homespec
+        let keyrings = secring:pubring:keyrings_
+
         let relock = do
                 (fsns,failed_locks) <- lockFiles keyrings
                 (wsns,failed_wlocks) <- lockFiles wallets
@@ -1375,7 +1378,7 @@ cross_merge doDecrypt grip0 keyrings wallets f = do
 
                 -- unlockFiles fsns ----------- Originally, I did this to enable altering the gpg keyrings
                 ------------------------------- from external tools. 
-                (db',_) <- f (sec_n,grip) db
+                (db',_) <- f (sec_n,grip) db pubring
                 -- lk <- relock --------------- The design is not quite safe, so it is disabled for now.
                 let lk = (fsns,failed_locks) -- 
                 -------------------------------
@@ -2407,17 +2410,13 @@ main = do
     let keypairs = catMaybes keypairs0
         btcpairs = catMaybes btcpairs0
 
-    (homedir,secring,pubring,grip0) <- getHomeDir ( join . take 1 <$> Map.lookup "--homedir" margs)
-
-    let keyrings = secring:pubring:keyrings_
-
     {-
     putStrLn $ "keypairs = "++show keypairs
     putStrLn $ "publics  = "++show publics
     putStrLn $ "keyrings = "++show keyrings
     -}
 
-    cross_merge decrypt grip0 keyrings wallets $ \(secfile,grip) db -> do
+    cross_merge decrypt ( join . take 1 <$> Map.lookup "--homedir" margs) keyrings_ wallets $ \(secfile,grip) db pubring -> do
 
         use_db0 <- return db