diff --git a/renv.lock b/renv.lock index 11ffe12..eb0cc8f 100644 --- a/renv.lock +++ b/renv.lock @@ -3294,13 +3294,10 @@ }, "renv": { "Package": "renv", - "Version": "1.0.2", - "Source": "Repository", + "Version": "1.0.3", + "OS_type": null, "Repository": "CRAN", - "Requirements": [ - "utils" - ], - "Hash": "4b22ac016fe54028b88d0c68badbd061" + "Source": "Repository" }, "reprex": { "Package": "reprex", diff --git a/renv/activate.R b/renv/activate.R index 2969c73..cb5401f 100644 --- a/renv/activate.R +++ b/renv/activate.R @@ -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 @@ -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 @@ -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()