haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #947 from chreekat/keter-package-extra-files

Browse Source 
Add and process Keter option 'extraFiles'
This commit is contained in:
Michael Snoyman 2015-03-06 09:15:38 +02:00
commit 9429d163b6
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
yesod-bin/Keter.hs
View File

@ -9,7 +9,7 @@ import qualified Data.Text as T
import System.Exit import System.Exit
import System.Process import System.Process
import Control.Monad import Control.Monad
import System.Directory import System.Directory hiding (findFiles)
import Data.Maybe (mapMaybe) import Data.Maybe (mapMaybe)
import qualified Filesystem.Path.CurrentOS as F import qualified Filesystem.Path.CurrentOS as F
import qualified Filesystem as F import qualified Filesystem as F
@ -53,14 +53,18 @@ keter cabal noBuild = do
[] -> error "No cabal file found" [] -> error "No cabal file found"
_ -> error "Too many cabal files found" _ -> error "Too many cabal files found"
let findExecs (Object v) = let findFiles (Object v) =
mapM_ go $ Map.toList v mapM_ go $ Map.toList v
where where
go ("exec", String s) = tell [F.collapse $ "config" F.</> F.fromText s] go ("exec", String s) = tellFile s
go (_, v') = findExecs v' go ("extraFiles", Array a) = Fold.mapM_ tellExtra a
findExecs (Array v) = Fold.mapM_ findExecs v go (_, v') = findFiles v'
findExecs _ = return () tellFile s = tell [F.collapse $ "config" F.</> F.fromText s]
execs = execWriter $ findExecs $ Object value tellExtra (String s) = tellFile s
tellExtra _ = error "extraFiles should be a flat array"
findFiles (Array v) = Fold.mapM_ findFiles v
findFiles _ = return ()
bundleFiles = execWriter $ findFiles $ Object value
unless noBuild $ do unless noBuild $ do
run cabal ["clean"] run cabal ["clean"]
@ -69,7 +73,8 @@ keter cabal noBuild = do
_ <- try' $ F.removeTree "static/tmp" _ <- try' $ F.removeTree "static/tmp"
archive <- Tar.pack "" $ "config" : "static" : map F.encodeString execs archive <- Tar.pack "" $
"config" : "static" : map F.encodeString bundleFiles
let fp = T.unpack project ++ ".keter" let fp = T.unpack project ++ ".keter"
L.writeFile fp $ compress $ Tar.write archive L.writeFile fp $ compress $ Tar.write archive