Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #164 #171

Merged
merged 1 commit into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 2 additions & 26 deletions R/installation.R
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ generate_installation_order <- function(rang) {
#' @seealso [generate_installation_order()]
#' @details The idea behind this is to determine the installation order of R packages locally. Then, the installation script can be deployed to another
#' fresh R session to install R packages. [dockerize()] and [apptainerize()] are more reasonable ways because a fresh R session with all system requirements
#' is provided. The current approach does not work in R < 2.1.0.
#' is provided.
#' @export
#' @references
#' Ripley, B. (2005) [Packages and their Management in R 2.1.0.](https://cran.r-project.org/doc/Rnews/Rnews_2005-1.pdf) R News, 5(1):8--11.
Expand Down Expand Up @@ -284,7 +284,7 @@ export_renv <- function(rang, path = ".") {

.generate_container_readme <- function(output_dir, image, verb = c("dockerize", "apptainerize/singularize")) {
file.create(file.path(output_dir,"README"))
con <- file(file.path(output_dir,"README"), open="w")
con <- file(file.path(output_dir,"README"), open = "w")
verb <- match.arg(verb)
template_path <- switch(verb,
"dockerize" = "docker_readme_template.txt",
Expand Down Expand Up @@ -446,30 +446,6 @@ export_renv <- function(rang, path = ".") {
rel_dir = rel_dir,
copy_all = copy_all)
}
## if (.is_r_version_older_than(rang, "3.1") || isTRUE(no_rocker)) {
## file.copy(system.file("compile_r.sh", package = "rang"), file.path(base_dir, "compile_r.sh"),
## overwrite = TRUE)
## containerfile_content <- generate_eol(r_version = r_version,
## sysreqs_cmd = sysreqs_cmd, lib = lib,
## cache = cache,
## debian_version = debian_version,
## post_installation_steps = post_installation_steps,
## rel_dir = rel_dir,
## copy_all = copy_all)
## if (isTRUE(cache)) {
## .cache_rsrc(r_version = r_version, base_dir = base_dir,
## verbose = verbose, cran_mirror = cran_mirror)
## .cache_debian(debian_version = debian_version, base_dir = base_dir,
## verbose = verbose)
## }
## } else {
## containerfile_content <- generate_rocker(r_version = r_version,
## sysreqs_cmd = sysreqs_cmd, lib = lib,
## cache = cache, image = image,
## post_installation_steps = post_installation_steps,
## rel_dir = rel_dir,
## copy_all = copy_all)
## }
if (!(is.null(materials_dir))) {
materials_subdir_in_output_dir <- file.path(base_dir, "materials")
if (isFALSE(dir.exists(materials_subdir_in_output_dir))) {
Expand Down
2 changes: 1 addition & 1 deletion man/apptainerize.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/dockerize.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/export_rang.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.