Include magic database in the linux and OSX standalone builds.
This commit is contained in:
parent
5d0b5eeefb
commit
471a211d21
5 changed files with 21 additions and 2 deletions
|
@ -33,6 +33,7 @@ import Git.CheckAttr (unspecifiedAttr)
|
|||
|
||||
#ifdef WITH_MAGICMIME
|
||||
import Magic
|
||||
import Utility.Env
|
||||
#endif
|
||||
|
||||
import Data.Either
|
||||
|
@ -131,7 +132,12 @@ mkLargeFilesParser = do
|
|||
#ifdef WITH_MAGICMIME
|
||||
magicmime <- liftIO $ catchMaybeIO $ do
|
||||
m <- magicOpen [MagicMimeType]
|
||||
liftIO $ magicLoadDefault m
|
||||
liftIO $ do
|
||||
md <- getEnv "GIT_ANNEX_DIR"
|
||||
case md of
|
||||
Nothing -> magicLoadDefault m
|
||||
Just d -> magicLoad m
|
||||
(d </> "magic" </> "magic.mgc")
|
||||
return m
|
||||
#endif
|
||||
let parse = parseToken $ commonTokens
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue