Skip to content

Commit

Permalink
[actions] update 26 packages
Browse files Browse the repository at this point in the history
  • Loading branch information
zkamvar authored Feb 6, 2024
1 parent 62c1860 commit 52fe01d
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 89 deletions.
29 changes: 4 additions & 25 deletions renv/activate.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
local({

# the requested version of renv
version <- "1.0.2.9000"
attr(version, "sha") <- "07d800d98f4b286db3844540d485c1c81791e510"
version <- "1.0.3.9000"
attr(version, "sha") <- "4146b070d0749ec87a35d2f037e4d59cd8fe5894"

# the project directory
project <- getwd()
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 52fe01d

Please sign in to comment.