From aa4ea3ac1c6d0eee8491f6175a7b577edba24ba8 Mon Sep 17 00:00:00 2001 From: "[1000i100] Millicent Billette" <git@1000i100.fr> Date: Fri, 29 Nov 2019 14:51:58 +0100 Subject: [PATCH] FEAT: add video replay info when available FIX: git hook call update-readme.sh so no more duplicate code --- README.md | 1 + launch-me-once-after-git-clone-to-auto-update-readme.sh | 5 +++-- public/42l/2019-11-13-g1/{markdown.md => slideshow.md} | 0 public/rml14/dunitrust/{markdown.md => slideshow.md} | 0 public/rml14/pkstl/{markdown.md => slideshow.md} | 0 .../dup-protocol/{markdown.md => slideshow.md} | 0 public/rustkathon2019_1/durs/{markdown.md => slideshow.md} | 0 .../g1-ecosystem/{markdown.md => slideshow.md} | 0 public/rustkathon2019_1/wasm/{markdown.md => slideshow.md} | 0 .../dunitrust/{markdown.md => slideshow.md} | 0 public/rustkathon2019_2/tdd/{markdown.md => slideshow.md} | 0 update-readme.sh | 6 +++++- 12 files changed, 9 insertions(+), 3 deletions(-) rename public/42l/2019-11-13-g1/{markdown.md => slideshow.md} (100%) rename public/rml14/dunitrust/{markdown.md => slideshow.md} (100%) rename public/rml14/pkstl/{markdown.md => slideshow.md} (100%) rename public/rustkathon2019_1/dup-protocol/{markdown.md => slideshow.md} (100%) rename public/rustkathon2019_1/durs/{markdown.md => slideshow.md} (100%) rename public/rustkathon2019_1/g1-ecosystem/{markdown.md => slideshow.md} (100%) rename public/rustkathon2019_1/wasm/{markdown.md => slideshow.md} (100%) rename public/rustkathon2019_2/dunitrust/{markdown.md => slideshow.md} (100%) rename public/rustkathon2019_2/tdd/{markdown.md => slideshow.md} (100%) diff --git a/README.md b/README.md index 2b03e9b..6699f6c 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ sh launch-me-once-after-git-clone-to-auto-update-readme.sh ### Rustkathon 1 (mars 2019) - [Le protocole DUP](https://librelois.duniter.io/slides/rustkathon2019_1/dup-protocol/) + (Replay [peertube](https://tube.p2p.legal/videos/watch/d88f37e6-99b3-41cb-ba9a-2a1bd3c57be0) | [youtube](https://www.youtube.com/watch?v=1ZOb7XDk3Dc)) - [DURS (DUniter-RuSt)](https://librelois.duniter.io/slides/rustkathon2019_1/durs/) - [Écosystème technique de la Ğ1](https://librelois.duniter.io/slides/rustkathon2019_1/g1-ecosystem/) - [Rust & Web Assembly](https://librelois.duniter.io/slides/rustkathon2019_1/wasm/) diff --git a/launch-me-once-after-git-clone-to-auto-update-readme.sh b/launch-me-once-after-git-clone-to-auto-update-readme.sh index 7f25fb1..382e95e 100644 --- a/launch-me-once-after-git-clone-to-auto-update-readme.sh +++ b/launch-me-once-after-git-clone-to-auto-update-readme.sh @@ -2,6 +2,7 @@ # to launch me, type in terminal : sh launch-me-once-after-git-clone-to-auto-update-readme.sh -mkdir -p .git/hooks/ -cp update-readme.sh .git/hooks/pre-commit +cp launch-me-once-after-git-clone-to-auto-update-readme.sh .git/hooks/pre-commit chmod 755 .git/hooks/pre-commit + +sh update-readme.sh \ No newline at end of file diff --git a/public/42l/2019-11-13-g1/markdown.md b/public/42l/2019-11-13-g1/slideshow.md similarity index 100% rename from public/42l/2019-11-13-g1/markdown.md rename to public/42l/2019-11-13-g1/slideshow.md diff --git a/public/rml14/dunitrust/markdown.md b/public/rml14/dunitrust/slideshow.md similarity index 100% rename from public/rml14/dunitrust/markdown.md rename to public/rml14/dunitrust/slideshow.md diff --git a/public/rml14/pkstl/markdown.md b/public/rml14/pkstl/slideshow.md similarity index 100% rename from public/rml14/pkstl/markdown.md rename to public/rml14/pkstl/slideshow.md diff --git a/public/rustkathon2019_1/dup-protocol/markdown.md b/public/rustkathon2019_1/dup-protocol/slideshow.md similarity index 100% rename from public/rustkathon2019_1/dup-protocol/markdown.md rename to public/rustkathon2019_1/dup-protocol/slideshow.md diff --git a/public/rustkathon2019_1/durs/markdown.md b/public/rustkathon2019_1/durs/slideshow.md similarity index 100% rename from public/rustkathon2019_1/durs/markdown.md rename to public/rustkathon2019_1/durs/slideshow.md diff --git a/public/rustkathon2019_1/g1-ecosystem/markdown.md b/public/rustkathon2019_1/g1-ecosystem/slideshow.md similarity index 100% rename from public/rustkathon2019_1/g1-ecosystem/markdown.md rename to public/rustkathon2019_1/g1-ecosystem/slideshow.md diff --git a/public/rustkathon2019_1/wasm/markdown.md b/public/rustkathon2019_1/wasm/slideshow.md similarity index 100% rename from public/rustkathon2019_1/wasm/markdown.md rename to public/rustkathon2019_1/wasm/slideshow.md diff --git a/public/rustkathon2019_2/dunitrust/markdown.md b/public/rustkathon2019_2/dunitrust/slideshow.md similarity index 100% rename from public/rustkathon2019_2/dunitrust/markdown.md rename to public/rustkathon2019_2/dunitrust/slideshow.md diff --git a/public/rustkathon2019_2/tdd/markdown.md b/public/rustkathon2019_2/tdd/slideshow.md similarity index 100% rename from public/rustkathon2019_2/tdd/markdown.md rename to public/rustkathon2019_2/tdd/slideshow.md diff --git a/update-readme.sh b/update-readme.sh index 7beeb99..87c09d0 100644 --- a/update-readme.sh +++ b/update-readme.sh @@ -23,9 +23,13 @@ for folder in `ls public/` fi for slide in `ls public/$folder/` do - if test "slideshow.md" != $slide + if test "event.md" != $slide then res="${res}- [`sed -n -e 's/^\##* *\(.*\)$/\1/p' public/${folder}/${slide}/slideshow.md | head -n 1`](${urlRoot}/${folder}/${slide}/)\n" fi + if test "!!nothing!!" != "`cat public/${folder}/${slide}/video.md 2>/dev/null || echo "!!nothing!!"`" + then res="${res} `cat public/${folder}/${slide}/video.md`\n" + fi + done ;; esac -- GitLab