From 86c1681cd81c126f9aa8bf90a090a2b267c345c2 Mon Sep 17 00:00:00 2001 From: Edgar Ruiz Date: Wed, 10 Apr 2024 12:58:38 -0500 Subject: [PATCH] Adds support for CHATTR_MODEL --- R/chattr-defaults.R | 9 ++++++--- R/chattr-use.R | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/R/chattr-defaults.R b/R/chattr-defaults.R index 3487249..a98d3cb 100644 --- a/R/chattr-defaults.R +++ b/R/chattr-defaults.R @@ -75,20 +75,23 @@ chattr_defaults <- function(type = "default", if (force) { ch_env$defaults <- NULL } - + env_model <- NULL if (is.null(chattr_defaults_get(type))) { - # Overrides environment variable if YAML file is present if (file_exists(yaml_file)) { check_files <- yaml_file } else { check_files <- ch_package_file(Sys.getenv("CHATTR_USE", unset = NA)) } - + env_model <- Sys.getenv("CHATTR_MODEL", unset = NA) + if(is.na(env_model)) { + env_model <- NULL + } for (j in seq_along(check_files)) { td_defaults <- read_yaml(file = check_files[j]) loaded_default <- chattr_defaults_get(type = "default") td_defaults$default <- loaded_default %||% td_defaults$default + td_defaults$default[["model"]] <- env_model %||% td_defaults$default[["model"]] check_defaults <- c("default", type) for (i in seq_along(check_defaults)) { td <- td_defaults[[check_defaults[i]]] diff --git a/R/chattr-use.R b/R/chattr-use.R index f05ec20..ce76be8 100644 --- a/R/chattr-use.R +++ b/R/chattr-use.R @@ -155,7 +155,9 @@ use_switch <- function(..., .file) { } ch_package_file <- function(x) { - if(is.na(x)) return(NULL) + if (is.na(x)) { + return(NULL) + } env_folder <- ifelse(x == "test", "apptest", "configs") package_file(env_folder, path_ext_set(x, "yml")) }