Merge pull request #139 from LibraryCarpentry/update/packages

Update 9 packages

Author: nickyjgarland

renv/activate.R

@@ -169,6 +169,16 @@ local({
     if (quiet)
       return(invisible())
 
+    # also check for config environment variables that should suppress messages
+    # https://github.com/rstudio/renv/issues/2214
+    enabled <- Sys.getenv("RENV_CONFIG_STARTUP_QUIET", unset = NA)
+    if (!is.na(enabled) && tolower(enabled) %in% c("true", "1"))
+      return(invisible())
+  
+    enabled <- Sys.getenv("RENV_CONFIG_SYNCHRONIZED_CHECK", unset = NA)
+    if (!is.na(enabled) && tolower(enabled) %in% c("false", "0"))
+      return(invisible())
+  
     msg <- sprintf(fmt, ...)
     cat(msg, file = stdout(), sep = if (appendLF) "\n" else "")
 
@@ -266,22 +276,22 @@ local({
     # check for repos override
     repos <- Sys.getenv("RENV_CONFIG_REPOS_OVERRIDE", unset = NA)
     if (!is.na(repos)) {
-
+  
       # split on ';' if present
       parts <- strsplit(repos, ";", fixed = TRUE)[[1L]]
-
+  
       # split into named repositories if present
       idx <- regexpr("=", parts, fixed = TRUE)
       keys <- substring(parts, 1L, idx - 1L)
       vals <- substring(parts, idx + 1L)
       names(vals) <- keys
-
+  
       # if we have a single unnamed repository, call it CRAN
       if (length(vals) == 1L && identical(keys, ""))
         names(vals) <- "CRAN"
-
+  
       return(vals)
-
+  
     }
 
     # check for lockfile repositories
@@ -547,6 +557,12 @@ local({
 
     # infer path to renv cache
     cache <- Sys.getenv("RENV_PATHS_CACHE", unset = "")
+    if (!nzchar(cache)) {
+      root <- Sys.getenv("RENV_PATHS_ROOT", unset = NA)
+      if (!is.na(root))
+        cache <- file.path(root, "cache")
+    }
+  
     if (!nzchar(cache)) {
       tools <- asNamespace("tools")
       if (is.function(tools$R_user_dir)) {
@@ -1036,7 +1052,7 @@ local({
 
   renv_bootstrap_validate_version_release <- function(version, description) {
     expected <- description[["Version"]]
-    is.character(expected) && identical(expected, version)
+    is.character(expected) && identical(c(expected), c(version))
   }
 
   renv_bootstrap_hash_text <- function(text) {