From 338e98c8efcbdabbe00e1f9e64f409aa64f3581a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Aug 2016 15:32:31 -0400 Subject: add support for multiple storage locattions also, server upload queues in ~/.keysafe --- CmdLine.hs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'CmdLine.hs') diff --git a/CmdLine.hs b/CmdLine.hs index 1c0abd2..a55e985 100644 --- a/CmdLine.hs +++ b/CmdLine.hs @@ -11,14 +11,11 @@ import qualified Gpg import Options.Applicative import qualified Data.ByteString.UTF8 as BU8 import System.Directory -import Storage -import Storage.Local -import Storage.Network data CmdLine = CmdLine { mode :: Maybe Mode , secretkeysource :: Maybe SecretKeySource - , storage :: Storage + , localstorage :: Bool , gui :: Bool , testMode :: Bool , customShardParams :: Maybe ShardParams @@ -31,7 +28,7 @@ parse :: Parser CmdLine parse = CmdLine <$> optional (backup <|> restore <|> benchmark) <*> optional (gpgswitch <|> fileswitch) - <*> localstorageflag + <*> localstorageswitch <*> guiswitch <*> testmodeswitch <*> optional (ShardParams <$> totalobjects <*> neededobjects) @@ -58,7 +55,7 @@ parse = CmdLine <> metavar "FILE" <> help "Specify secret key file to back up or restore. (The same filename must be used to restore a key as was used to back it up.)" ) - localstorageflag = flag networkStorage localStorage + localstorageswitch = switch ( long "store-local" <> help "Store data locally, in ~/.keysafe/objects. (The default is to store data in the cloud.)" ) -- cgit v1.2.3