diff options
author | Joey Hess <joey@kitenet.net> | 2011-01-27 17:00:32 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-01-27 17:00:32 -0400 |
commit | 167523f09d48777f3a5931fdcbc21b9d363e0e6c (patch) | |
tree | 698c1c601b39b617ccc02259053c3c39372ed5db /Command/Init.hs | |
parent | 6be516ae3bddb8f05ea62661019836e03be12a2c (diff) |
better directory handling
Rename Locations functions for better consitency, and make their values
more consistent too.
Used </> rather than manually building paths. There are still more places
that manually do so, but are tricky, due to the behavior of </> when
the second FilePath is absolute. So I only changed places where
it obviously was relative.
Diffstat (limited to 'Command/Init.hs')
-rw-r--r-- | Command/Init.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Command/Init.hs b/Command/Init.hs index 47ac8e4c0..e780c8863 100644 --- a/Command/Init.hs +++ b/Command/Init.hs @@ -10,6 +10,7 @@ module Command.Init where import Control.Monad.State (liftIO) import Control.Monad (when) import System.Directory +import System.FilePath import Command import qualified Annex @@ -75,7 +76,7 @@ gitAttributesWrite repo = do attributes] attrLine :: String -attrLine = stateLoc ++ "*.log merge=union" +attrLine = stateDir </> "*.log merge=union" {- set up a git pre-commit hook, if one is not already present -} gitPreCommitHookWrite :: Git.Repo -> Annex () |