Update toolchain check

andrjohns · andrjohns · commit e2f91e4e4659 · 2024-01-23T20:18:32.000+02:00
diff --git a/R/install.R b/R/install.R
@@ -818,11 +818,13 @@ is_toolchain_installed <- function(app, path) {
       )
       app_path <- withr::with_path(
         c(
-          toolchain_PATH_env_var()
+          toolchain_PATH_env_var(),
+          rtools_make_path()
         ),
         repair_path(dirname(Sys.which(app)))
       )
-      if (normalizePath(app_path) != normalizePath(rtools4x_toolchain_path())) {
+      if (!(normalizePath(app_path) %in% c(normalizePath(rtools4x_toolchain_path()),
+                                         normalizePath(rtools_make_path())))) {
         return(FALSE)
       }
       return(TRUE)

Original file line number	Diff line number	Diff line change
`@@ -818,11 +818,13 @@ is_toolchain_installed <- function(app, path) {`
`818`	`818`	`)`
`819`	`819`	`app_path <- withr::with_path(`
`820`	`820`	`c(`
`821`		`- toolchain_PATH_env_var()`
	`821`	`+ toolchain_PATH_env_var(),`
	`822`	`+ rtools_make_path()`
`822`	`823`	`),`
`823`	`824`	`repair_path(dirname(Sys.which(app)))`
`824`	`825`	`)`
`825`		`- if (normalizePath(app_path) != normalizePath(rtools4x_toolchain_path())) {`
	`826`	`+ if (!(normalizePath(app_path) %in% c(normalizePath(rtools4x_toolchain_path()),`
	`827`	`+ normalizePath(rtools_make_path())))) {`
`826`	`828`	`return(FALSE)`
`827`	`829`	`}`
`828`	`830`	`return(TRUE)`