Merge pull request #6 from ZorzArg/develop

fix config labels to .RProj
OHDSI · Sep 5, 2023 · b480746 · b480746
2 parents 1e534c4 + f28a4ec
commit b480746
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/R/config.R b/R/config.R
@@ -52,7 +52,8 @@ addConfig <- function(block, database = block, projectPath = here::here(), open
   check <- config_check()
 
   if (check) {
-    projName <- basename(projectPath)
+    projFile <- list.files(projectPath, pattern = ".Rproj", full.names = TRUE)
+    projName <- basename(tools::file_path_sans_ext(here::here(projFile)))
     cohortTable <- paste(projName, database, sep = "_")
 
     config_block_txt <- glue::glue(

diff --git a/R/makeFiles.R b/R/makeFiles.R
@@ -58,7 +58,8 @@ makeNews <- function(projectPath = here::here(), open = TRUE) {
 #' @export
 makeConfig <- function(block, database = block, projectPath = here::here(), open = TRUE) {
 
-  projName <- basename(projectPath)
+  projFile <- list.files(projectPath, pattern = ".Rproj", full.names = TRUE)
+  projName <- basename(tools::file_path_sans_ext(here::here(projFile)))
 
   data <- rlang::list2(
     'Project' = projName,