Merge pull request #37 from rpearce/fix/dotfile-copying

fix: dotfile copying and ignoring other files
This commit is contained in:
Robert Pearce 2023-02-01 20:30:52 +13:00 committed by GitHub
commit 793dc3c7da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions

View file

@ -71,7 +71,7 @@
installPhase = '' installPhase = ''
mkdir -p "$out/dist" mkdir -p "$out/dist"
cp -r dist/* "$out/dist" cp -a dist/. "$out/dist"
''; '';
}; };

View file

@ -1,10 +1,12 @@
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
import Control.Monad (forM_) import Control.Monad (forM_)
import Data.List (isPrefixOf, isSuffixOf)
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
import Hakyll import Hakyll
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.Slugger as Slugger import qualified Data.Text.Slugger as Slugger
import System.FilePath (takeFileName)
import Text.Pandoc import Text.Pandoc
( Extension (Ext_fenced_code_attributes, Ext_footnotes, Ext_gfm_auto_identifiers, Ext_implicit_header_references, Ext_smart), ( Extension (Ext_fenced_code_attributes, Ext_footnotes, Ext_gfm_auto_identifiers, Ext_implicit_header_references, Ext_smart),
Extensions, Extensions,
@ -28,17 +30,27 @@ siteName :: String
siteName = siteName =
"My Site Name" "My Site Name"
-- Default configuration: https://github.com/jaspervdj/hakyll/blob/cd74877d41f41c4fba27768f84255e797748a31a/lib/Hakyll/Core/Configuration.hs#L101-L125
config :: Configuration config :: Configuration
config = config =
defaultConfiguration defaultConfiguration
{ destinationDirectory = "dist" { destinationDirectory = "dist"
, ignoreFile = const False , ignoreFile = ignoreFile'
, previewHost = "127.0.0.1" , previewHost = "127.0.0.1"
, previewPort = 8000 , previewPort = 8000
, providerDirectory = "src" , providerDirectory = "src"
, storeDirectory = "ssg/_cache" , storeDirectory = "ssg/_cache"
, tmpDirectory = "ssg/_tmp" , tmpDirectory = "ssg/_tmp"
} }
where
ignoreFile' path
| "." `isPrefixOf` fileName = False
| "#" `isPrefixOf` fileName = True
| "~" `isSuffixOf` fileName = True
| ".swp" `isSuffixOf` fileName = True
| otherwise = False
where
fileName = takeFileName path
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
-- BUILD -- BUILD

View file

@ -11,6 +11,7 @@ executable hakyll-site
hs-source-dirs: src hs-source-dirs: src
build-depends: base >= 4.8 build-depends: base >= 4.8
, hakyll >= 4.14 , hakyll >= 4.14
, filepath >= 1.0
, pandoc >= 2.11 , pandoc >= 2.11
, slugger >= 0.1.0.1 , slugger >= 0.1.0.1
, text >= 1.2 && < 1.3 , text >= 1.2 && < 1.3