Skip to content
Snippets Groups Projects
Verified Commit 4995f843 authored by orestis.malaspin's avatar orestis.malaspin
Browse files

corrected problem with markdown merge

parent ca2f6be7
No related branches found
No related tags found
No related merge requests found
...@@ -33,10 +33,10 @@ markdown: $(MARKDOWN) # La markdown les cibles %.markdown ...@@ -33,10 +33,10 @@ markdown: $(MARKDOWN) # La markdown les cibles %.markdown
pandoc -s $(OPTIONS) $(REVEALOPTIONS) -o $@ $^ pandoc -s $(OPTIONS) $(REVEALOPTIONS) -o $@ $^
%.markdown: metadata.yaml %.md yq %.markdown: metadata.yaml %.md yq
sed '1 { /^---/ { :a N; /\n---/! ba; d} }' $< > no_header sed '1 { /^---/ { :a N; /\n---/! ba; d} }' $(shell echo $(word 2, $^)) > no_header
grep -v -F -x -f no_header $< > header.yaml grep -v -F -x -f no_header $(shell echo $(word 2, $^)) > header.yaml
echo "---" > tmp.yaml echo "---" > tmp.yaml
./yq_linux_amd64 merge metadata.yaml header.yaml >> tmp.yaml ./yq_linux_amd64 merge header.yaml metadata.yaml >> tmp.yaml
cat tmp.yaml no_header > $@ cat tmp.yaml no_header > $@
rm no_header header.yaml tmp.yaml rm no_header header.yaml tmp.yaml
......
...@@ -6,7 +6,7 @@ patat: ...@@ -6,7 +6,7 @@ patat:
margins: margins:
left: 10 left: 10
right: 10 right: 10
... ---
# La hotline # La hotline
......
--- ---
subtitle: "Programmation séquentielle en C, 2021-2022" subtitle: "Programmation séquentielle en C, 2021-2022"
author: "Orestis Malaspinas (A401), ISC, HEPIA" author: "Orestis Malaspinas (A401), ISC, HEPIA"
institute: Inspirés des slides de F. Glück institute: "Inspirés des slides de F. Glück"
lang: fr-CH lang: "fr-CH"
revealjs-url: /reveal.js revealjs-url: /reveal.js
mathjaxurl: "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS_HTML" mathjaxurl: "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS_HTML"
--- ---
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment