Merge pull request #1550 from rstudio/conda-tweaks

Improve echoed conda env mngt commands; echo miniconda install commands
rstudio · Mar 13, 2024 · 1e00158 · 1e00158
2 parents c616732 + 0622f40
commit 1e00158
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/R/conda.R b/R/conda.R
@@ -238,7 +238,7 @@ conda_create <- function(envname = NULL,
     args <- c(args, "-c", ch)
 
   # invoke conda
-  result <- system2t(conda, shQuote(args))
+  result <- system2t(conda, maybe_shQuote(args))
   if (result != 0L) {
     fmt <- "Error creating conda environment '%s' [exit code %i]"
     stopf(fmt, envname, result, call. = FALSE)
@@ -260,10 +260,10 @@ conda_create_env <- function(envname, environment, conda) {
     if (is.null(envname))
       c()
     else if (grepl("/", envname))
-      c("--prefix", shQuote(envname))
+      c("--prefix", maybe_shQuote(envname))
     else
-      c("--name", shQuote(envname)),
-    "-f", shQuote(environment)
+      c("--name", maybe_shQuote(envname)),
+    "-f", maybe_shQuote(environment)
   )
 
   result <- system2t(conda, args)
@@ -302,7 +302,7 @@ conda_clone <- function(envname, ..., clone = "base", conda = "auto") {
   args <- c(args, "--clone", clone)
 
   # invoke conda
-  result <- system2t(conda, shQuote(args))
+  result <- system2t(conda, maybe_shQuote(args))
   if (result != 0L) {
     fmt <- "Error creating conda environment '%s' [exit code %i]"
     stopf(fmt, envname, result, call. = FALSE)
@@ -376,7 +376,7 @@ conda_remove <- function(envname,
 
   # remove packages (or the entire environment)
   args <- conda_args("remove", envname, packages)
-  result <- system2t(conda, shQuote(args))
+  result <- system2t(conda, maybe_shQuote(args))
   if (result != 0L) {
     stop("Error ", result, " occurred removing conda environment ", envname,
          call. = FALSE)
@@ -457,7 +457,7 @@ conda_install <- function(envname = NULL,
   # (should be no-op if that copy of Python already installed)
   if (!is.null(python_version)) {
     args <- conda_args("install", envname, python_package)
-    status <- system2t(conda, shQuote(args))
+    status <- system2t(conda, maybe_shQuote(args))
     if (status != 0L) {
       fmt <- "installation of '%s' into environment '%s' failed [error code %i]"
       msg <- sprintf(fmt, python_package, envname, status)
@@ -494,7 +494,7 @@ conda_install <- function(envname = NULL,
     args <- c(args, "-c", ch)
 
   args <- c(args, python_package, packages)
-  result <- system2t(conda, shQuote(args))
+  result <- system2t(conda, maybe_shQuote(args))
 
   # check for errors
   if (result != 0L) {
@@ -581,7 +581,7 @@ conda_update <- function(conda = "auto") {
   name <- if ("anaconda" %in% envlist$name) "anaconda" else "conda"
 
   # attempt update
-  system2t(conda, c("update", "--prefix", shQuote(prefix), "--yes", name))
+  system2t(conda, c("update", "--prefix", maybe_shQuote(prefix), "--yes", name))
 }
 
 numeric_conda_version <- function(conda = "auto", version_string = conda_version(conda)) {

diff --git a/R/miniconda.R b/R/miniconda.R
@@ -239,14 +239,14 @@ miniconda_installer_run <- function(installer, update, path) {
   }
   if (is_windows()) {
     installer <- normalizePath(installer)
-    status <- system2(installer, args)
+    status <- system2t(installer, args)
   }
   if (is_unix()) {
     ##check for bash
     bash_path <- Sys.which("bash")
     if (bash_path[1] == "")
       stopf("The miniconda installer requires bash.")
-    status <- system2(bash_path[1], c(installer, args))
+    status <- system2t(bash_path[1], c(installer, args))
   }
   if (status != 0)
     stopf("miniconda installation failed [exit code %i]", status)