From 8b23b1d5ab11001fa3261fc973af9861595c22b3 Mon Sep 17 00:00:00 2001 From: Yann Esposito Date: Wed, 30 Mar 2016 09:52:51 +0200 Subject: [PATCH] building using stack --- .gitignore | 5 +++-- build.sh | 7 +++++++ compile.hs | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100755 build.sh diff --git a/.gitignore b/.gitignore index f10f809..71aa9e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ TAGS +build/ compile -compile.hi -compile.o +*.hi +*.o *.html *.pdf diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..3c9f09c --- /dev/null +++ b/build.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env zsh + +if hash stack 2>/dev/null; then + stack ghc -- -odir build -hidir build compile.hs -O2 +else + print -- "Please install 'stack' (http://haskellstack.org)" +fi diff --git a/compile.hs b/compile.hs index d78a6b1..23ac1ff 100755 --- a/compile.hs +++ b/compile.hs @@ -60,7 +60,7 @@ main = do -- | Find Markdown Files (skip hidden directories) findMarkdownFiles :: Shell FilePath findMarkdownFiles = do - fic <- find (has ".md") "." & fgrep (invert (prefix "./.")) + fic <- find (suffix ".md") "." & fgrep (invert (prefix "./.")) let mf = stripPrefix "./" fic _ <- guard (isJust mf) return (fromJust mf) @@ -101,7 +101,7 @@ toReveal dbg fpath = do mslideLevel <- fold (fpath & filename & input & grep (prefix "slide_level: ") - & sed (prefix "slide_level: " *> star digit)) + & sed (prefix ("slide_level: " *> plus digit))) Fold.head let slideLevel = maybe "2" (\l -> if l == "" then "2" else l) mslideLevel dest = fpath & filename