haskell/stackage-server
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage-server.git synced 2026-01-23 09:21:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better yesod-gitrepo dev mode

Browse Source
This commit is contained in:
Michael Snoyman 2014-12-09 15:38:36 +02:00
parent 968805f01f
commit 8c90ad02d3
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Application.hs
View File

@ -34,7 +34,7 @@ import Yesod.Core.Types (loggerSet, Logger (Logger))
import Yesod.Default.Config import Yesod.Default.Config
import Yesod.Default.Handlers import Yesod.Default.Handlers
import Yesod.Default.Main import Yesod.Default.Main
import Yesod.GitRepo (gitRepo) import Yesod.GitRepo
import System.Environment (getEnvironment) import System.Environment (getEnvironment)
import Data.BlobStore (HasBlobStore (..), BlobStore) import Data.BlobStore (HasBlobStore (..), BlobStore)
import System.IO (hSetBuffering, BufferMode (LineBuffering)) import System.IO (hSetBuffering, BufferMode (LineBuffering))
@ -166,16 +166,35 @@ makeFoundation useEcho conf = do
(statusRef, unpacker) <- createHaddockUnpacker haddockRootDir' blobStore' (statusRef, unpacker) <- createHaddockUnpacker haddockRootDir' blobStore'
widgetCache' <- newIORef mempty widgetCache' <- newIORef mempty
when development $ void $ rawSystem "git" #if MIN_VERSION_yesod_gitrepo(0,1,1)
[ "clone" websiteContent' <- if development
, "https://github.com/fpco/stackage-content.git" then do
] void $ rawSystem "git"
websiteContent' <- gitRepo [ "clone"
(if development , "https://github.com/fpco/stackage-content.git"
then "stackage-content" ]
else "https://github.com/fpco/stackage-content.git") gitRepoDev "stackage-content" loadWebsiteContent
"master" else gitRepo
loadWebsiteContent "https://github.com/fpco/stackage-content.git"
"master"
loadWebsiteContent
#else
websiteContent' <- if development
then do
void $ rawSystem "git"
[ "clone"
, "https://github.com/fpco/stackage-content.git"
]
tmp <- gitRepo "stackage-content" "master" loadWebsiteContent
return tmp
{ grRefresh = return ()
, grContent = loadWebsiteContent "stackage-content"
}
else gitRepo
"https://github.com/fpco/stackage-content.git"
"master"
loadWebsiteContent
#endif
let logger = Yesod.Core.Types.Logger loggerSet' getter let logger = Yesod.Core.Types.Logger loggerSet' getter
foundation = App foundation = App