diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1605259 --- /dev/null +++ b/Makefile @@ -0,0 +1,14 @@ +TOP = site +CABAL_SB = ./.cabal-sandbox/x86_64-osx-ghc-7.8.3-packages.conf.d +GHC_FLAGS = -v -package-db=$(CABAL_SB) -threaded + +all: $(TOP) + +deploy: $(TOP) + ./$(TOP) rebuild && ./$(TOP) deploy + +clean: + rm *.hi *.o $(TOP) + +$(TOP): $(TOP).hs + ghc $(GHC_FLAGS) $(TOP).hs diff --git a/content/about.md b/content/about.md index 53a561d..2ee588b 100644 --- a/content/about.md +++ b/content/about.md @@ -1,6 +1,6 @@ I am a graduate student in the [Department of Computer Science](http://cis.upenn.edu) at the [University of -Pennsylvania](http://upenn.edu). +Pennsylvania](http://www.upenn.edu). There, I am associated with the [Theory Group](http://theory.cis.upenn.edu), the [PL Club], and the [Privacy Group](http://privacy.cis.upenn.edu). I am very fortunate to be co-advised by [Benjamin diff --git a/files/docs/AGGH14paper.pdf b/files/docs/AGGH14paper.pdf old mode 100755 new mode 100644 diff --git a/files/docs/BGGHKS14paper.pdf b/files/docs/BGGHKS14paper.pdf old mode 100755 new mode 100644 diff --git a/files/docs/GHHNP13paper.pdf b/files/docs/GHHNP13paper.pdf old mode 100755 new mode 100644 diff --git a/files/docs/WHE13paper.pdf b/files/docs/WHE13paper.pdf old mode 100755 new mode 100644 diff --git a/files/posters/GGHRW14poster.pdf b/files/posters/GGHRW14poster.pdf old mode 100755 new mode 100644 diff --git a/files/posters/HHRRW14poster.pdf b/files/posters/HHRRW14poster.pdf old mode 100755 new mode 100644 diff --git a/files/slides/HKR12slides.pdf b/files/slides/HKR12slides.pdf old mode 100755 new mode 100644 diff --git a/files/slides/HRRU14slides.pdf b/files/slides/HRRU14slides.pdf old mode 100755 new mode 100644 diff --git a/files/slides/HRU13slides.pdf b/files/slides/HRU13slides.pdf old mode 100755 new mode 100644 diff --git a/images/haskell-logo.png b/images/haskell-logo.png deleted file mode 100644 index 97c0937..0000000 Binary files a/images/haskell-logo.png and /dev/null differ diff --git a/scripts/deploy.sh b/scripts/deploy.sh new file mode 100644 index 0000000..a86a8a7 --- /dev/null +++ b/scripts/deploy.sh @@ -0,0 +1,5 @@ +#!/opt/local/bin/zsh + +find . -type d -exec chmod 755 {} \; +find . -type f -exec chmod 644 {} \; +\rsync -avzp -e ssh ./_site/ jackknife:/home/justhsu/html/ diff --git a/site.hs b/site.hs index a429b52..c1e9176 100644 --- a/site.hs +++ b/site.hs @@ -8,6 +8,10 @@ import System.Process import Text.Pandoc.Options import Text.Regex +config :: Configuration +config = defaultConfiguration + { deployCommand = "./scripts/deploy" } + -------------------------------------------------------------------------------- bibHeaders :: [(String, String, [String])] bibHeaders = [ ("confs", "Conference Publications", @@ -54,7 +58,7 @@ bib2bibParse file = -------------------------------------------------------------------------------- main :: IO () -main = hakyll $ do +main = hakyllWith config $ do match "files/**" $ do route idRoute compile copyFileCompiler