summaryrefslogtreecommitdiffhomepage
path: root/keysafe.hs
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2016-08-31 14:30:35 -0400
committerJoey Hess <joeyh@joeyh.name>2016-08-31 14:33:22 -0400
commit019c080687ce4a07031bdfe2263397f4f868c3c3 (patch)
tree187c7abb67ce1c0bc126a48501de4e7ed3e1f7e0 /keysafe.hs
parent176dbd5798a7def03ea6c61713a0c216ab1e1674 (diff)
downloadkeysafe-019c080687ce4a07031bdfe2263397f4f868c3c3.tar.gz
added --store-directory
Diffstat (limited to 'keysafe.hs')
-rw-r--r--keysafe.hs7
1 files changed, 4 insertions, 3 deletions
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 _ =