Skip to content

Commit

Permalink
Merge pull request carpentries-incubator#119 from carpentries-incubat…
Browse files Browse the repository at this point in the history
…or/update/packages

Update 32 packages
  • Loading branch information
lgatto authored Nov 7, 2023
2 parents ef0de0d + 9e42347 commit b4644f8
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 89 deletions.
27 changes: 3 additions & 24 deletions renv/activate.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
local({

# the requested version of renv
version <- "1.0.2"
version <- "1.0.3"
attr(version, "sha") <- NULL

# the project directory
Expand Down Expand Up @@ -1034,19 +1034,6 @@ local({

}


renv_bootstrap_in_rstudio <- function() {
commandArgs()[[1]] == "RStudio"
}

# Used to work around buglet in RStudio if hook uses readline
renv_bootstrap_flush_console <- function() {
tryCatch({
tools <- as.environment("tools:rstudio")
tools$.rs.api.sendToConsole("", echo = FALSE, focus = FALSE)
}, error = function(cnd) {})
}

renv_json_read <- function(file = NULL, text = NULL) {

jlerr <- NULL
Expand Down Expand Up @@ -1185,16 +1172,8 @@ local({
# construct full libpath
libpath <- file.path(root, prefix)

if (renv_bootstrap_in_rstudio()) {
# RStudio only updates console once .Rprofile is finished, so
# instead run code on sessionInit
setHook("rstudio.sessionInit", function(...) {
renv_bootstrap_exec(project, libpath, version)
renv_bootstrap_flush_console()
})
} else {
renv_bootstrap_exec(project, libpath, version)
}
# run bootstrap code
renv_bootstrap_exec(project, libpath, version)

invisible()

Expand Down
Loading

0 comments on commit b4644f8

Please sign in to comment.