Skip to content
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.

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

Define include, share, and doc environment variables #640

Merged
merged 8 commits into from
Nov 27, 2024
Merged

Conversation

lionel-
Copy link
Contributor

@lionel- lionel- commented Nov 25, 2024

Addresses posit-dev/positron#3637.

Positron Notes

Release Notes

New Features

  • N/A

Bug Fixes

QA Notes

This should not fail:

stopifnot(
  nzchar(Sys.getenv('R_SHARE_DIR')),
  nzchar(Sys.getenv('R_INCLUDE_DIR')),
  nzchar(Sys.getenv('R_DOC_DIR'))
)

We test for these on our side.

@@ -24,9 +24,18 @@ where
{
assert!(COMMAND_R_LOCATIONS.len() > 0);

// If `R_HOME` is defined use that
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So that r_command() works properly when the currently active R is not the same as the one on the path.

Comment on lines 23 to -25
F: Fn(&mut Command),
{
assert!(COMMAND_R_LOCATIONS.len() > 0);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Split into r_command() and r_command_from_path() or r_home_from_path() depending on what makes sense

@lionel- lionel- merged commit 38ee0bf into main Nov 27, 2024
6 checks passed
@lionel- lionel- deleted the feature/env-vars branch November 27, 2024 15:56
@github-actions github-actions bot locked and limited conversation to collaborators Nov 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants