Skip to content

Use command in BROWSER env if present for doc command #1289

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
Diggsey merged 2 commits into from
May 27, 2018
Merged

Use command in BROWSER env if present for doc command #1289

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e735538
Use browser in BROWSER env if present for `doc` command
naufraghi Nov 6, 2017
cbb6aeb
Merge branch 'master' into issue/1287/rustup-doc-browser
naufraghi Apr 13, 2018
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
8 changes: 7 additions & 1 deletion src/rustup-utils/src/raw.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,12 @@ pub fn open_browser(path: &Path) -> io::Result<bool> {
#[cfg(not(windows))]
fn inner(path: &Path) -> io::Result<bool> {
use std::process::Stdio;
use std::env;

let env_browser = env::var_os("BROWSER").map(|b| env::split_paths(&b).collect::<Vec<_>>());
let env_commands = env_browser.as_ref()
.map(|cmds| cmds.iter().by_ref().filter_map(|b| b.to_str()).collect())
.unwrap_or(vec![]);

let commands = [
"xdg-open",
Expand All @@ -372,7 +378,7 @@ pub fn open_browser(path: &Path) -> io::Result<bool> {
"chromium",
"sensible-browser",
];
if let Some(cmd) = find_cmd(&commands) {
if let Some(cmd) = find_cmd(&env_commands).or(find_cmd(&commands)) {
Command::new(cmd)
.arg(path)
.stdin(Stdio::null())
Expand Down