Skip to content

Commit 9c71bef

Browse files
committed
running install2 as shell so CRAN is not an issue
1 parent 235f09f commit 9c71bef

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

R/package-installation-methods.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ add_install_instructions <- function(base_dockerfile,
8989

9090
if (versioned_packages) {
9191
futile.logger::flog.info("Versioned packages enabled, installing 'versions'")
92-
addInstruction(base_dockerfile) <- Run("install2.r", "versions")
92+
addInstruction(base_dockerfile) <- Run_shell("install2.r", "versions")
9393
}
9494

9595
# 2. add installation instruction for CRAN packages
@@ -101,7 +101,7 @@ add_install_instructions <- function(base_dockerfile,
101101
} else {
102102
cran_packages <- stringr::str_sort(as.character(unlist(pkgs_cran$name))) # sort, to increase own reproducibility
103103
futile.logger::flog.info("Adding CRAN packages: %s", toString(cran_packages))
104-
addInstruction(base_dockerfile) <- Run("install2.r", cran_packages)
104+
addInstruction(base_dockerfile) <- Run_shell("install2.r", cran_packages)
105105
}
106106
} else futile.logger::flog.debug("No CRAN packages to add.")
107107

@@ -115,7 +115,7 @@ add_install_instructions <- function(base_dockerfile,
115115
bioc_packages <- stringr::str_sort(as.character(unlist(pkgs_bioc$name))) # sort, to increase own reproducibility
116116
futile.logger::flog.info("Adding Bioconductor packages: %s", toString(bioc_packages))
117117
repos = as.character(BiocManager::repositories())
118-
addInstruction(base_dockerfile) <- Run("install2.r", params = c(sprintf("-r %s -r %s -r %s -r %s",
118+
addInstruction(base_dockerfile) <- Run_shell("install2.r", params = c(sprintf("-r %s -r %s -r %s -r %s",
119119
repos[1], repos[2],
120120
repos[3], repos[4]),
121121
bioc_packages))
@@ -161,7 +161,7 @@ versioned_install_instructions <- function(pkgs) {
161161
unversioned <- pkgs_sorted[is.na(pkgs_sorted$version),]
162162
unversioned <- stringr::str_sort(as.character(unlist(unversioned$name))) # sort, to increase own reproducibility
163163
futile.logger::flog.warn("No version information found for packages: %s", toString(unversioned))
164-
instructions <- c(Run("install2.r", unversioned), instructions)
164+
instructions <- c(Run_shell("install2.r", unversioned), instructions)
165165
}
166166
return(instructions)
167167
}

0 commit comments

Comments
 (0)