From 3fbc5ae88eaced3884cc50cb3837783d02e5304c Mon Sep 17 00:00:00 2001 From: pat-s Date: Wed, 24 Jul 2024 22:09:19 +0200 Subject: [PATCH] variable renaming --- NAMESPACE | 2 +- R/helpers.R | 4 ++-- R/upload.R | 10 +++++----- man/set_bin_path.Rd | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index 04841c7..5a340a2 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -15,7 +15,7 @@ importFrom(DBI,dbGetQuery) importFrom(DBI,dbListTables) importFrom(DBI,dbWriteTable) importFrom(RPostgres,Postgres) -importFrom(cli,cli_alert_info) +importFrom(cli,cli_alert) importFrom(cranlike,add_PACKAGES) importFrom(dplyr,all_vars) importFrom(dplyr,filter) diff --git a/R/helpers.R b/R/helpers.R index 79b8f31..6e491be 100644 --- a/R/helpers.R +++ b/R/helpers.R @@ -29,7 +29,7 @@ set_codename <- function(codename) { #' Helper function to set the path for binary package outputs #' @export set_bin_path <- function( - r_version_minor, build_for_minor, + r_minor_version, build_for_minor, local_build_root, codename) { if (!build_for_minor) { path <- sprintf( @@ -39,7 +39,7 @@ set_bin_path <- function( } else { path <- sprintf( "%s/__linux__/%s/%s/latest/src/contrib", - local_build_root, codename, r_version_minor + local_build_root, codename, r_minor_version ) } return(path) diff --git a/R/upload.R b/R/upload.R index ac55d73..5b3ae7d 100644 --- a/R/upload.R +++ b/R/upload.R @@ -6,17 +6,17 @@ upload_single_binary_to_s3 <- function( bucket = "devxy-arm64-r-binaries", local_build_root = "/root", codename = NULL, package_name, tag, - r_version_minor = NULL, build_for_minor = FALSE, + r_minor_version = NULL, build_for_minor = FALSE, force = FALSE, debug = FALSE) { codename <- set_codename(codename) - if (is.null(r_version_minor)) { - r_version_minor <- sub("R version (\\d+\\.\\d+).*", "\\1", R.Version()$version.string) + if (is.null(r_minor_version)) { + r_minor_version <- sub("R version (\\d+\\.\\d+).*", "\\1", R.Version()$version.string) } - local_bin_path <- set_bin_path(r_version_minor, build_for_minor, local_build_root = local_build_root, codename) - remote_bin_path <- set_bin_path(r_version_minor, build_for_minor, local_build_root = bucket, codename) + local_bin_path <- set_bin_path(r_minor_version, build_for_minor, local_build_root = local_build_root, codename) + remote_bin_path <- set_bin_path(r_minor_version, build_for_minor, local_build_root = bucket, codename) if (debug) { cli::cli_alert_danger("DEBUG: dir_out_bin: {dir_out_bin}, codename: {codename}") diff --git a/man/set_bin_path.Rd b/man/set_bin_path.Rd index c986b54..25e454a 100644 --- a/man/set_bin_path.Rd +++ b/man/set_bin_path.Rd @@ -4,7 +4,7 @@ \alias{set_bin_path} \title{Helper function to set the path for binary package outputs} \usage{ -set_bin_path(r_version_minor, build_for_minor, local_build_root, codename) +set_bin_path(r_minor_version, build_for_minor, local_build_root, codename) } \description{ Helper function to set the path for binary package outputs