Fix Python scripts for Windows: UTF-8 encoding (#485)

[rnaseq-cwl-training.git] / Makefile

diff --git a/Makefile b/Makefile
index c2b18534cc155a4964100b80ccd2f18ada282fb0..b585662ce1d299f5bca302fb53c12a623f9ea536 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,9 @@
-# Use /bin/bash instead of /bin/sh
-export SHELL = /bin/bash
-
 ## ========================================
 ## Commands for both workshop and lesson websites.
 
 # Settings
 MAKEFILES=Makefile $(wildcard *.mk)
-JEKYLL_VERSION=3.8.5
-JEKYLL=bundle install --path .vendor/bundle && bundle update && bundle exec jekyll
+JEKYLL=bundle config --local set path .vendor/bundle && bundle install && bundle update && bundle exec jekyll
 PARSER=bin/markdown_ast.rb
 DST=_site
 
@@ -54,11 +50,14 @@ site : lesson-md
 
 ## * docker-serve     : use Docker to serve the site
 docker-serve :
-       docker run --rm -it --volume ${PWD}:/srv/jekyll \
-           --volume=${PWD}/.docker-vendor/bundle:/usr/local/bundle \
-           -p 127.0.0.1:4000:4000 \
-           jekyll/jekyll:${JEKYLL_VERSION} \
-           bin/run-make-docker-serve.sh
+       docker pull carpentries/lesson-docker:latest
+       docker run --rm -it \
+               -v $${PWD}:/home/rstudio \
+               -p 4000:4000 \
+               -p 8787:8787 \
+               -e USERID=$$(id -u) \
+               -e GROUPID=$$(id -g) \
+               carpentries/lesson-docker:latest
 
 ## * repo-check       : check repository settings
 repo-check :
@@ -126,7 +125,7 @@ lesson-md : ${RMD_DST}
 _episodes/%.md: _episodes_rmd/%.Rmd
        @bin/knit_lessons.sh $< $@
 
-# * lesson-check     : validate lesson Markdown
+## * lesson-check     : validate lesson Markdown
 lesson-check : lesson-fixme
        @${PYTHON} bin/lesson_check.py -s . -p ${PARSER} -r _includes/links.md
 
@@ -147,7 +146,7 @@ lesson-files :
 
 ## * lesson-fixme     : show FIXME markers embedded in source files
 lesson-fixme :
-       @fgrep -i -n FIXME ${MARKDOWN_SRC} || true
+       @grep --fixed-strings --word-regexp --line-number --no-messages FIXME ${MARKDOWN_SRC} || true
 
 ##
 ## IV. Auxililary (plumbing) commands