Skip to content

[Windows] Improve R finding for special installation #1051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 3, 2022
Merged

[Windows] Improve R finding for special installation #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78ad457
Add a specific handling of windows R binary in bin/ subfolder
cderv Jun 2, 2022
964620d
[windows] R is now found if several binaries in PATH
cderv Jun 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/core/path.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@ export async function which(cmd: string) {
{ cmd: args, stderr: "piped", stdout: "piped" },
);
if (result.code === 0) {
return result.stdout?.trim();
return Deno.build.os === "windows"
// WHERE return all files found, only first is kept
? result.stdout?.split("\n")[0].trim()
: result.stdout?.trim();
} else {
return undefined;
}
Expand Down
10 changes: 8 additions & 2 deletions src/core/resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { existsSync, walkSync } from "fs/mod.ts";
import { dirname, join } from "path/mod.ts";
import { warnOnce } from "./log.ts";
import { which } from "./path.ts";
import { safeExistsSync, which } from "./path.ts";
import { quartoConfig } from "./quarto.ts";
import {
kHKeyCurrentUser,
Expand Down Expand Up @@ -63,7 +63,13 @@ export async function rBinaryPath(binary: string): Promise<string> {
// if there is an R_HOME then respect that
const rHome = Deno.env.get("R_HOME");
if (rHome) {
return join(rHome, "bin", binary);
let rHomeBin = join(rHome, "bin", binary);
if (safeExistsSync(rHomeBin)) return rHomeBin;
if (Deno.build.os === "windows") {
// Some installation have binaries in the sub folder only
rHomeBin = join(rHome, "bin", "x64", binary);
if (safeExistsSync(rHomeBin)) return rHomeBin;
}
}

// then check the path
Expand Down