add missing else{}, allow setting arch manually
This commit is contained in:
parent
6db7443844
commit
1ddf365208
1 changed files with 12 additions and 7 deletions
|
|
@ -3,6 +3,7 @@
|
|||
#' @export
|
||||
#' @examples
|
||||
#' archive_package("AATtools", codename = "rhel9")
|
||||
#' archive_package("asbio", codename = "rhel9", arch = "amd64")
|
||||
#'
|
||||
archive_package <- function(
|
||||
package_name,
|
||||
|
|
@ -13,7 +14,8 @@ archive_package <- function(
|
|||
endpoint = "https://s3.eu-central-003.backblazeb2.com",
|
||||
region = "eu-central-003",
|
||||
bucket = "devxy-arm64-r-binaries",
|
||||
pause = NULL) {
|
||||
pause = NULL,
|
||||
arch = NULL) {
|
||||
s3fs::s3_file_system(
|
||||
aws_access_key_id = Sys.getenv("AWS_ACCESS_KEY_ID"),
|
||||
aws_secret_access_key = Sys.getenv("AWS_SECRET_ACCESS_KEY"),
|
||||
|
|
@ -23,11 +25,13 @@ archive_package <- function(
|
|||
|
||||
codename <- set_codename(codename)
|
||||
|
||||
local_arch = Sys.info()[["machine"]]
|
||||
if (grepl("arm64", local_arch) || grepl("aarch64", local_arch)) {
|
||||
arch <- "arm64"
|
||||
} else if (grepl("amd64", local_arch) || grepl("x86_64", local_arch)) {
|
||||
arch <- "amd64"
|
||||
if (is.null(arch)) {
|
||||
local_arch <- Sys.info()[["machine"]]
|
||||
if (grepl("arm64", local_arch) || grepl("aarch64", local_arch)) {
|
||||
arch <- "arm64"
|
||||
} else if (grepl("amd64", local_arch) || grepl("x86_64", local_arch)) {
|
||||
arch <- "amd64"
|
||||
}
|
||||
}
|
||||
|
||||
if (!build_for_minor) {
|
||||
|
|
@ -74,8 +78,9 @@ archive_package <- function(
|
|||
if (!is.null(pause)) {
|
||||
Sys.sleep(pause)
|
||||
}
|
||||
} else {
|
||||
cli::cli_alert("{.fun archive_package}: Skipping {.pkg {.x}} as only one package versions exists.")
|
||||
}
|
||||
cli::cli_alert("{.fun archive_package}: Skipping {.pkg {.x}} as only one package versions exists.")
|
||||
})
|
||||
|
||||
return(invisible(TRUE))
|
||||
|
|
|
|||
Loading…
Reference in a new issue