initremote works
This commit is contained in:
parent
05751d55cd
commit
0a4c610b4f
6 changed files with 85 additions and 30 deletions
13
Remote.hs
13
Remote.hs
|
@ -15,12 +15,14 @@ module Remote (
|
|||
hasKey,
|
||||
hasKeyCheap,
|
||||
|
||||
remoteTypes,
|
||||
byName,
|
||||
nameToUUID,
|
||||
keyPossibilities,
|
||||
remotesWithUUID,
|
||||
remotesWithoutUUID,
|
||||
|
||||
remoteLog,
|
||||
readRemoteLog,
|
||||
configSet,
|
||||
keyValToMap
|
||||
|
@ -34,8 +36,6 @@ import qualified Data.Map as M
|
|||
import Data.Maybe
|
||||
|
||||
import RemoteClass
|
||||
import qualified Remote.Git
|
||||
import qualified Remote.S3
|
||||
import Types
|
||||
import UUID
|
||||
import qualified Annex
|
||||
|
@ -43,6 +43,10 @@ import Trust
|
|||
import LocationLog
|
||||
import Locations
|
||||
import Messages
|
||||
import Utility
|
||||
|
||||
import qualified Remote.Git
|
||||
import qualified Remote.S3
|
||||
|
||||
remoteTypes :: [RemoteType Annex]
|
||||
remoteTypes =
|
||||
|
@ -150,7 +154,8 @@ configSet :: UUID -> M.Map String String -> Annex ()
|
|||
configSet u c = do
|
||||
m <- readRemoteLog
|
||||
l <- remoteLog
|
||||
liftIO $ writeFile l $ unlines $ map toline $ M.toList $ M.insert u c m
|
||||
liftIO $ safeWriteFile l $ unlines $ sort $
|
||||
map toline $ M.toList $ M.insert u c m
|
||||
where
|
||||
toline (u', c') = u' ++ " " ++ (unwords $ mapToKeyVal c')
|
||||
|
||||
|
@ -185,6 +190,6 @@ keyValToMap ws = M.fromList $ map (/=/) ws
|
|||
v = drop (1 + length k) s
|
||||
|
||||
mapToKeyVal :: M.Map String String -> [String]
|
||||
mapToKeyVal m = map toword $ M.toList m
|
||||
mapToKeyVal m = map toword $ sort $ M.toList m
|
||||
where
|
||||
toword (k, v) = k ++ "=" ++ v
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue