From 019c080687ce4a07031bdfe2263397f4f868c3c3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 31 Aug 2016 14:30:35 -0400 Subject: added --store-directory --- keysafe.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'keysafe.hs') diff --git a/keysafe.hs b/keysafe.hs index 3bb5793..2bb857b 100644 --- a/keysafe.hs +++ b/keysafe.hs @@ -43,8 +43,8 @@ main = do return (mkt testModeTunables, [mkt testModeTunables]) else return (mkt defaultTunables, map (mkt . snd) knownTunings) storagelocations <- if CmdLine.localstorage cmdline - then return localStorageLocations - else allStorageLocations + then pure $ localStorageLocations (CmdLine.localstoragedirectory cmdline) + else allStorageLocations (CmdLine.localstoragedirectory cmdline) dispatch cmdline ui storagelocations tunables possibletunables dispatch :: CmdLine.CmdLine -> UI -> StorageLocations -> Tunables -> [Tunables] -> IO () @@ -63,9 +63,10 @@ dispatch cmdline ui storagelocations tunables possibletunables = do go CmdLine.Restore Nothing = restore storagelocations ui possibletunables Gpg.anyKey go CmdLine.UploadQueued _ = - uploadQueued + uploadQueued (CmdLine.localstoragedirectory cmdline) go (CmdLine.Server) _ = runServer + (CmdLine.localstoragedirectory cmdline) (CmdLine.serverAddress $ CmdLine.serverConfig cmdline) (CmdLine.serverPort $ CmdLine.serverConfig cmdline) go CmdLine.Benchmark _ = -- cgit v1.2.3