ensure heredoc included with bootstrap script (#1874)

NEWS.md

@@ -1,5 +1,10 @@
+
 # renv (development version)
 
+* Fixed an issue where `renv`'s activate script failed to report version
+  conflict errors when starting up. (#1874)
+
+
 # renv 1.0.6
 
 * Fixed an issue where downloads could fail with curl >= 8.7.1. (#1869)

R/bootstrap.R

@@ -32,6 +32,21 @@ header <- function(label,
 
 }
 
+heredoc <- function(text, leave = 0) {
+
+  # remove leading, trailing whitespace
+  trimmed <- gsub("^\\s*\\n|\\n\\s*$", "", text)
+
+  # split into lines
+  lines <- strsplit(trimmed, "\n", fixed = TRUE)[[1L]]
+
+  # compute common indent
+  indent <- regexpr("[^[:space:]]", lines)
+  common <- min(setdiff(indent, -1L)) - leave
+  paste(substring(lines, common), collapse = "\n")
+
+}
+
 startswith <- function(string, prefix) {
   substring(string, 1, nchar(prefix)) == prefix
 }

R/utils.R

@@ -381,21 +381,6 @@ nth <- function(x, i) {
   x[[i]]
 }
 
-heredoc <- function(text, leave = 0) {
-
-  # remove leading, trailing whitespace
-  trimmed <- gsub("^\\s*\\n|\\n\\s*$", "", text)
-
-  # split into lines
-  lines <- strsplit(trimmed, "\n", fixed = TRUE)[[1L]]
-
-  # compute common indent
-  indent <- regexpr("[^[:space:]]", lines)
-  common <- min(setdiff(indent, -1L)) - leave
-  paste(substring(lines, common), collapse = "\n")
-
-}
-
 find <- function(x, f, ...) {
   for (i in seq_along(x))
     if (!is.null(value <- f(x[[i]], ...)))

inst/resources/activate.R

@@ -131,6 +131,21 @@ local({
 
   }
 
+  heredoc <- function(text, leave = 0) {
+
+    # remove leading, trailing whitespace
+    trimmed <- gsub("^\\s*\\n|\\n\\s*$", "", text)
+
+    # split into lines
+    lines <- strsplit(trimmed, "\n", fixed = TRUE)[[1L]]
+
+    # compute common indent
+    indent <- regexpr("[^[:space:]]", lines)
+    common <- min(setdiff(indent, -1L)) - leave
+    paste(substring(lines, common), collapse = "\n")
+
+  }
+
   startswith <- function(string, prefix) {
     substring(string, 1, nchar(prefix)) == prefix
   }