Merge pull request #666 from stan-dev/fix-toolchain-checks-windows

rok-cesnovar · web-flow · commit ee939e7e7ec5 · 2022-07-08T21:18:58.000+02:00
Windows fix: Normalize paths before comparing them
diff --git a/R/install.R b/R/install.R
@@ -685,7 +685,7 @@ is_toolchain_installed <- function(app, path) {
         ),
         repair_path(dirname(Sys.which(app)))
       )
-      if (app_path != rtools4x_toolchain_path()) {
+      if (normalizePath(app_path) != normalizePath(rtools4x_toolchain_path())) {
         return(FALSE)
       }
       return(TRUE)

Original file line number	Diff line number	Diff line change
`@@ -685,7 +685,7 @@ is_toolchain_installed <- function(app, path) {`
`685`	`685`	`),`
`686`	`686`	`repair_path(dirname(Sys.which(app)))`
`687`	`687`	`)`
`688`		`- if (app_path != rtools4x_toolchain_path()) {`
	`688`	`+ if (normalizePath(app_path) != normalizePath(rtools4x_toolchain_path())) {`
`689`	`689`	`return(FALSE)`
`690`	`690`	`}`
`691`	`691`	`return(TRUE)`