add workaround for regression in fs::file_exists()

cf. r-lib/fs#325
zdaarau · Dec 6, 2021 · e6b268d · e6b268d
1 parent 80bfe0e
commit e6b268d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/R/fokus.gen.R b/R/fokus.gen.R
@@ -87,12 +87,16 @@ rex::register_shortcuts(pkg_name = utils::packageName())
 
 path_private <- function(...) {
 
-  dir_private <- getOption("fokus.path_private",
-                           default = getwd())
+  dir_private <-
+    getOption("fokus.path_private",
+              default = getwd()) %>%
+    # TODO: remove `fs::path_expand()` below as soon as [issue #325](https://github.com/r-lib/fs/issues/325) is resolved
+    fs::path_expand()
 
   # ensure `fokus.path_private` is valid (read access plus file `data/aargau/survey_data_2018-09-23.xlsx` exists)
   is_valid_path <-
-    checkmate::test_directory(dir_private, access = "r") && fs::file_exists(path = fs::path(dir_private, "data/aargau/survey_data_2018-09-23.xlsx"))
+    checkmate::test_directory(dir_private, access = "r") &&
+    fs::file_exists(path = fs::path(dir_private, "data/aargau/survey_data_2018-09-23.xlsx"))
 
   if (!is_valid_path) {
 

diff --git a/Rmd/fokus.Rmd b/Rmd/fokus.Rmd
@@ -99,12 +99,16 @@ Assemble a FOKUS private working directory path
 ```{r}
 path_private <- function(...) {
   
-  dir_private <- getOption("fokus.path_private",
-                           default = getwd())
+  dir_private <-
+    getOption("fokus.path_private",
+              default = getwd()) %>%
+    # TODO: remove `fs::path_expand()` below as soon as [issue #325](https://github.com/r-lib/fs/issues/325) is resolved
+    fs::path_expand()
   
   # ensure `fokus.path_private` is valid (read access plus file `data/aargau/survey_data_2018-09-23.xlsx` exists)
   is_valid_path <-
-    checkmate::test_directory(dir_private, access = "r") && fs::file_exists(path = fs::path(dir_private, "data/aargau/survey_data_2018-09-23.xlsx"))
+    checkmate::test_directory(dir_private, access = "r") &&
+    fs::file_exists(path = fs::path(dir_private, "data/aargau/survey_data_2018-09-23.xlsx"))
   
   if (!is_valid_path) {