cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-03-31 15:43:24 -04:00
parent 9172b79612
commit 94d09dfd64
Failed to extract signature
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Propellor/CmdLine.hs
View File

@ -164,12 +164,13 @@ privDataMarker :: String
privDataMarker = "PRIVDATA " privDataMarker = "PRIVDATA "
toMarked :: Marker -> String -> String toMarked :: Marker -> String -> String
toMarked marker = unlines . map (marker ++) . lines toMarked marker = intercalate "\n" . map (marker ++) . lines
fromMarked :: Marker -> Marked -> Maybe String fromMarked :: Marker -> Marked -> Maybe String
fromMarked marker s fromMarked marker s
| null matches = Nothing | null matches = Nothing
| otherwise = Just $ unlines $ map (drop len) matches | otherwise = Just $ intercalate "\n" $
map (drop len) matches
where where
len = length marker len = length marker
matches = filter (marker `isPrefixOf`) $ lines s matches = filter (marker `isPrefixOf`) $ lines s
@ -184,7 +185,7 @@ boot props = do
makePrivDataDir makePrivDataDir
maybe noop (writeFileProtected privDataLocal) $ maybe noop (writeFileProtected privDataLocal) $
fromMarked privDataMarker reply fromMarked privDataMarker reply
case eitherToMaybe . B64.decode . BL.pack . s2w8 . takeWhile (/= '\n') =<< fromMarked keyringMarker reply of case eitherToMaybe . B64.decode . BL.pack . s2w8 =<< fromMarked keyringMarker reply of
Nothing -> noop Nothing -> noop
Just d -> do Just d -> do
writeFileProtected keyring "" writeFileProtected keyring ""