From 97ab130f41076a17d6af727bdb1b06667c3b5f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Sun, 17 Mar 2024 09:40:46 +0100 Subject: [PATCH] Update install-github.R script --- inst/install-github.R | 9 +++++++-- install-github.R | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/inst/install-github.R b/inst/install-github.R index 036584b6..e6ea63c7 100644 --- a/inst/install-github.R +++ b/inst/install-github.R @@ -1631,6 +1631,8 @@ function(...) { } # Contents of R/git-auth.R + # nocov start + gitcreds_get <- NULL gitcreds_set <- NULL gitcreds_delete <- NULL @@ -2097,7 +2099,8 @@ function(...) { c( GCM_INTERACTIVE = "Never", GCM_MODAL_PROMPT = "false", - GCM_VALIDATE = "false" + GCM_VALIDATE = "false", + GCM_GUI_PROMPT = "false" ) } @@ -2444,6 +2447,8 @@ function(...) { environment() }) + + # nocov end # Contents of R/git.R # Extract the commit hash from a git archive. Git archives include the SHA1 @@ -4563,7 +4568,7 @@ function(...) { sha = NA_character_)) } - if (is.null(x$RemoteType) || x$RemoteType == "cran") { + if (is.null(x$RemoteType) || x$RemoteType %in% c("cran", "standard", "any")) { # Packages installed with install.packages() or locally without remotes return(remote("cran", diff --git a/install-github.R b/install-github.R index 036584b6..e6ea63c7 100644 --- a/install-github.R +++ b/install-github.R @@ -1631,6 +1631,8 @@ function(...) { } # Contents of R/git-auth.R + # nocov start + gitcreds_get <- NULL gitcreds_set <- NULL gitcreds_delete <- NULL @@ -2097,7 +2099,8 @@ function(...) { c( GCM_INTERACTIVE = "Never", GCM_MODAL_PROMPT = "false", - GCM_VALIDATE = "false" + GCM_VALIDATE = "false", + GCM_GUI_PROMPT = "false" ) } @@ -2444,6 +2447,8 @@ function(...) { environment() }) + + # nocov end # Contents of R/git.R # Extract the commit hash from a git archive. Git archives include the SHA1 @@ -4563,7 +4568,7 @@ function(...) { sha = NA_character_)) } - if (is.null(x$RemoteType) || x$RemoteType == "cran") { + if (is.null(x$RemoteType) || x$RemoteType %in% c("cran", "standard", "any")) { # Packages installed with install.packages() or locally without remotes return(remote("cran",