From 63d07ed055ec4cb92aff1cac666288720d52d65f Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 2 Jun 2016 02:26:03 +0200 Subject: better storage format --- ymir/mlmmj-expose.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ymir/mlmmj-expose.nix') diff --git a/ymir/mlmmj-expose.nix b/ymir/mlmmj-expose.nix index 6673c06c..3481308d 100644 --- a/ymir/mlmmj-expose.nix +++ b/ymir/mlmmj-expose.nix @@ -41,7 +41,7 @@ let setCurrentDirectory listDir key <- (BS.readFile "exposed.key") `catchIOError` (\e -> if isDoesNotExistError e then randomKey >>= (\k -> BS.writeFile "exposed.key" k >> return k) else ioError e) let ((map toLower -> ident), (map toLower -> recipient)) = read . CLBS.unpack $ decryptMsg CBC key extension - identities <- (read <$> readFile "exposed.ids") `catchIOError` (\e -> if isDoesNotExistError e then return [] else ioError e) + identities <- (lines <$> readFile "exposed.ids") `catchIOError` (\e -> if isDoesNotExistError e then return [] else ioError e) unless (ident `elem` identities) . die $ "Unknown sender: ‘" ++ ident ++ "’" subscribers <- getSubscribers unless (recipient `elem` subscribers) . die $ "Unknown recipient: ‘" ++ recipient ++ "’" @@ -56,7 +56,7 @@ let identities <- (read <$> readFile "exposed.ids") `catchIOError` (\e -> if isDoesNotExistError e then return [] else ioError e) case ident `elem` identities of True -> putStrLn "Identity is already known" - False -> writeFile "exposed.ids" . show $ ident : identities + False -> writeFile "exposed.ids" . unlines $ ident : identities _ -> hPutStrLn stderr ("Called without expected arguments ( )") >> exitWith (ExitFailure 2) "mlmmj-get-exposed" -> do args <- getArgs @@ -64,7 +64,7 @@ let [listDir, (map toLower -> ident), (map toLower -> recipient)] -> do setCurrentDirectory listDir key <- (BS.readFile "exposed.key") `catchIOError` (\e -> if isDoesNotExistError e then randomKey >>= (\k -> BS.writeFile "exposed.key" k >> return k) else ioError e) - identities <- (read <$> readFile "exposed.ids") `catchIOError` (\e -> if isDoesNotExistError e then return [] else ioError e) + identities <- (lines <$> readFile "exposed.ids") `catchIOError` (\e -> if isDoesNotExistError e then return [] else ioError e) unless (ident `elem` identities) . die $ "Unknown sender: ‘" ++ ident ++ "’" subscribers <- getSubscribers unless (recipient `elem` subscribers) . die $ "Unknown recipient: ‘" ++ recipient ++ "’" -- cgit v1.2.3