From ef60916704b5def5090afd510018ca825519b138 Mon Sep 17 00:00:00 2001 From: Milan Malfait Date: Tue, 10 Oct 2023 16:29:26 +0100 Subject: [PATCH 1/3] Make sure root_path() always points to lesson root --- R/utils-built-db.R | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/R/utils-built-db.R b/R/utils-built-db.R index 96f4bd2f1..8c864eb8d 100644 --- a/R/utils-built-db.R +++ b/R/utils-built-db.R @@ -293,11 +293,7 @@ build_status <- function(sources, db = "site/built/md5sum.txt", rebuild = FALSE, # If we have a single source passed in, this means that we want to update it # in the database and force it to rebuild - if (build_one) { - root_path <- root_path(sources) - } else { - root_path <- fs::path_common(sources) - } + root_path <- root_path(fs::path_common(sources)) # ensure we're at the actual lesson root path sources <- fs::path_rel(sources, start = root_path) built_path <- fs::path_rel(fs::path_dir(db), root_path) From 0f32458e06682fbf2ef2108ca83cfb07e83fad64 Mon Sep 17 00:00:00 2001 From: Milan Malfait Date: Mon, 16 Oct 2023 10:02:59 +0100 Subject: [PATCH 2/3] Add @milanmlft as contributor --- DESCRIPTION | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/DESCRIPTION b/DESCRIPTION index efc67ba4d..45b03e339 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -35,6 +35,11 @@ Authors@R: c( family = "Gruson", role = c("ctb"), email = "hugo.gruson+R@normalesup.org"), + person(given = "Milan", + family = "Malfait", + role = c("ctb"), + email = "milan.malfait94@gmail.com", + comment = c(ORCID = "0000-0001-9144-3701")), person()) Description: We provide tools to build a Carpentries-themed lesson repository into an accessible standalone static website. These include local tools and From d16d1270ac0d40df9c5ed2c7faad295287be4eb9 Mon Sep 17 00:00:00 2001 From: Milan Malfait Date: Mon, 16 Oct 2023 10:06:40 +0100 Subject: [PATCH 3/3] Update NEWS --- NEWS.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/NEWS.md b/NEWS.md index 1f37a4e59..a721ddc47 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,13 @@ +# sandpaper (development version) + +## BUG FIX + +* Make sure `root_path()` always points to lesson root (#532) + +## MISC + +* Added @milanmlft as contributor + # sandpaper 0.14.0 (2023-10-02) ## NEW FEATURES