Merge branch 'master' of github.com:jaspervdj/hakyll
This commit is contained in:
commit
0639a73c24
5 changed files with 17 additions and 9 deletions
|
@ -13,4 +13,4 @@ title: Home
|
||||||
<h2>Posts</h2>
|
<h2>Posts</h2>
|
||||||
$partial("templates/post-list.html")$
|
$partial("templates/post-list.html")$
|
||||||
|
|
||||||
<p>…or you can find more in the <a href="/archive.html">archives</a>.
|
<p>…or you can find more in the <a href="/archive.html">archives</a>.</p>
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
{-# LANGUAGE CPP #-}
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
-- | A Compiler that supports unix filters.
|
-- | A Compiler that supports unix filters.
|
||||||
module Hakyll.Core.UnixFilter
|
module Hakyll.Core.UnixFilter
|
||||||
|
@ -19,7 +21,6 @@ import System.Exit (ExitCode (..))
|
||||||
import System.IO (Handle, hClose, hFlush, hGetContents,
|
import System.IO (Handle, hClose, hFlush, hGetContents,
|
||||||
hPutStr, hSetEncoding, localeEncoding)
|
hPutStr, hSetEncoding, localeEncoding)
|
||||||
import System.Process
|
import System.Process
|
||||||
import qualified System.Info as System
|
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
import Hakyll.Core.Compiler
|
import Hakyll.Core.Compiler
|
||||||
|
@ -105,17 +106,19 @@ unixFilterIO :: Monoid o
|
||||||
-> i
|
-> i
|
||||||
-> IO (o, String, ExitCode)
|
-> IO (o, String, ExitCode)
|
||||||
unixFilterIO writer reader programName args input = do
|
unixFilterIO writer reader programName args input = do
|
||||||
-- The problem on Windows is that `proc` is that it is unable to execute
|
-- The problem on Windows is that `proc` is unable to execute
|
||||||
-- batch stubs (eg. anything created using 'gem install ...') even if its in
|
-- batch stubs (eg. anything created using 'gem install ...') even if its in
|
||||||
-- `$PATH`. A solution to this issue is to execute the batch file explicitly
|
-- `$PATH`. A solution to this issue is to execute the batch file explicitly
|
||||||
-- using `cmd /c batchfile` but there is no rational way to know where said
|
-- using `cmd /c batchfile` but there is no rational way to know where said
|
||||||
-- batchfile is on the system. Hence, we detect windows using the
|
-- batchfile is on the system. Hence, we detect windows using the
|
||||||
-- `System.Info` module and then instead of using `proc` to create the
|
-- CPP and instead of using `proc` to create the process, use `shell`
|
||||||
-- process, use `shell` instead which will be able to execute everything
|
-- which will be able to execute everything `proc` can
|
||||||
-- `proc` can, and this can deal with batch files as well.
|
-- as well as batch files.
|
||||||
let pr = if System.os == "mingw32"
|
#ifdef mingw32_HOST_OS
|
||||||
then shell $ unwords (programName : args)
|
let pr = shell $ unwords (programName : args)
|
||||||
else proc programName args
|
#else
|
||||||
|
let pr = proc programName args
|
||||||
|
#endif
|
||||||
|
|
||||||
(Just inh, Just outh, Just errh, pid) <-
|
(Just inh, Just outh, Just errh, pid) <-
|
||||||
createProcess pr
|
createProcess pr
|
||||||
|
|
|
@ -124,6 +124,7 @@ toSiteRoot = emptyException . joinPath . map parent
|
||||||
emptyException x = x
|
emptyException x = x
|
||||||
relevant "." = False
|
relevant "." = False
|
||||||
relevant "/" = False
|
relevant "/" = False
|
||||||
|
relevant "./" = False
|
||||||
relevant _ = True
|
relevant _ = True
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -59,6 +59,8 @@ tests = testGroup "Hakyll.Web.Html.Tests" $ concat
|
||||||
, "." @=? toSiteRoot "index.html"
|
, "." @=? toSiteRoot "index.html"
|
||||||
, "." @=? toSiteRoot "/index.html"
|
, "." @=? toSiteRoot "/index.html"
|
||||||
, "../.." @=? toSiteRoot "foo/bar/qux"
|
, "../.." @=? toSiteRoot "foo/bar/qux"
|
||||||
|
, ".." @=? toSiteRoot "./foo/bar.html"
|
||||||
|
, ".." @=? toSiteRoot "/foo/./bar.html"
|
||||||
]
|
]
|
||||||
|
|
||||||
, fromAssertions "isExternal"
|
, fromAssertions "isExternal"
|
||||||
|
|
|
@ -85,6 +85,8 @@ this list. This list has no particular ordering.
|
||||||
[source](https://github.com/TikhonJelvis/website)
|
[source](https://github.com/TikhonJelvis/website)
|
||||||
- <https://secure.plaimi.net/>,
|
- <https://secure.plaimi.net/>,
|
||||||
[source](https://github.com/plaimi/www)
|
[source](https://github.com/plaimi/www)
|
||||||
|
- <http://duplode.github.io/>,
|
||||||
|
[source](https://github.com/duplode/duplode.github.io/tree/sources)
|
||||||
|
|
||||||
## Hakyll 3.X
|
## Hakyll 3.X
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue