Skip to content

Commit b5bab54

Browse files
authored
Merge pull request #661 from stan-dev/fix-grep-windows
Fix finding grep.exe path on Windows
2 parents eec8e2c + 9fe50a3 commit b5bab54

File tree

1 file changed

+26
-4
lines changed

1 file changed

+26
-4
lines changed

R/csv.R

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,19 @@ read_cmdstan_csv <- function(files,
227227
num_post_warmup_draws <- ceiling(metadata$iter_sampling / metadata$thin)
228228
for (output_file in files) {
229229
if (os_is_windows()) {
230-
grep_path <- paste0('"', repair_path(Sys.which("grep.exe")), '"')
231-
fread_cmd <- paste0(grep_path, " -v '^#' --color=never '", output_file, "'")
230+
grep_path_repaired <- withr::with_path(
231+
c(
232+
toolchain_PATH_env_var()
233+
),
234+
repair_path(Sys.which("grep.exe"))
235+
)
236+
grep_path_quotes <- paste0('"', grep_path_repaired, '"')
237+
fread_cmd <- paste0(
238+
grep_path_quotes,
239+
" -v '^#' --color=never '",
240+
output_file,
241+
"'"
242+
)
232243
} else {
233244
fread_cmd <- paste0("grep -v '^#' --color=never '", output_file, "'")
234245
}
@@ -558,8 +569,19 @@ read_csv_metadata <- function(csv_file) {
558569
sampling_time <- 0
559570
total_time <- 0
560571
if (os_is_windows()) {
561-
grep_path <- paste0('"', repair_path(Sys.which("grep.exe")), '"')
562-
fread_cmd <- paste0(grep_path, " '^[#a-zA-Z]' --color=never '", csv_file, "'")
572+
grep_path_repaired <- withr::with_path(
573+
c(
574+
toolchain_PATH_env_var()
575+
),
576+
repair_path(Sys.which("grep.exe"))
577+
)
578+
grep_path_quotes <- paste0('"', grep_path_repaired, '"')
579+
fread_cmd <- paste0(
580+
grep_path_quotes,
581+
" '^[#a-zA-Z]' --color=never '",
582+
csv_file,
583+
"'"
584+
)
563585
} else {
564586
fread_cmd <- paste0("grep '^[#a-zA-Z]' --color=never '", csv_file, "'")
565587
}

0 commit comments

Comments
 (0)