Merge pull request #271 from fmichonneau/check-knitr-version

[fix #270] check knitr version before converting Rmd to md
swcarpentry · Jun 30, 2015 · a7c7240 · a7c7240
2 parents c19c252 + 926c4d8
commit a7c7240
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -55,7 +55,8 @@ preview : $(DST_ALL)
 	    -o $@ $<
 
 # Pattern to convert R Markdown to Markdown.
-%.md: %.Rmd $(R_CHUNK_OPTS)
+%.md: %.Rmd $(R_CHUNK_OPTS) tools/check_knitr_version.R
+	Rscript -e "source('tools/check_knitr_version.R')"
 	Rscript -e "knitr::knit('$$(basename $<)', output = '$$(basename $@)')"
 
 ## commands : Display available commands.

diff --git a/tools/check_knitr_version.R b/tools/check_knitr_version.R
@@ -0,0 +1,5 @@
+if (require("knitr")) {
+    if (packageVersion("knitr") < '1.9.19') {
+        stop("knitr must be version 1.9.20 or higher")
+    }
+} else stop("knitr 1.9.20 or above is needed to build the lessons.")