move functions around between files. nothing should be different

 merge-note: I'm having trouble with the merge, so I'm leaving a lot of
 functions duplicated in lib/Keyring.hs that were originally moved-out
 to lib/KeyRing/BuildKeyDB.hs in this commit.  I'll clean-up later.
 Hopefully.

1 files changed, 5 insertions, 5 deletions

diff --git a/cokiki.hs b/cokiki.hs
index a685977..d145045 100644
--- a/cokiki.hs
+++ b/cokiki.hs
@@ -63,11 +63,11 @@ main = do
     (cmd,args) <- splitAt 1 <$> getArgs
     uid <- getEffectiveUserID
     let msel = case cmd of
-                ["ssh-client"] -> Just $ sshClient  uid <$> Kiki.opt_chroot <*> Kiki.opt_homedir
-                ["ssh-server"] -> Just $ sshServer  uid <$> Kiki.opt_chroot <*> Kiki.opt_homedir
-                ["strongswan"] -> Just $ strongswan uid <$> Kiki.opt_chroot <*> Kiki.opt_homedir
-                ["tor"]        -> Just $ configureTor uid <$> Kiki.opt_chroot <*> Kiki.opt_homedir
-                ["hosts"]      -> Just $ configureHosts uid <$> Kiki.opt_chroot <*> Kiki.opt_homedir
+                ["ssh-client"] -> Just $ sshClient  uid <$> Kiki.dashdashChroot <*> Kiki.dashdashHomedir
+                ["ssh-server"] -> Just $ sshServer  uid <$> Kiki.dashdashChroot <*> Kiki.dashdashHomedir
+                ["strongswan"] -> Just $ strongswan uid <$> Kiki.dashdashChroot <*> Kiki.dashdashHomedir
+                ["tor"]        -> Just $ configureTor uid <$> Kiki.dashdashChroot <*> Kiki.dashdashHomedir
+                ["hosts"]      -> Just $ configureHosts uid <$> Kiki.dashdashChroot <*> Kiki.dashdashHomedir
                 _ -> Nothing
         spec = uncurry fancy Kiki.kikiOptions ""
         errorQuit msg = do