language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-04 00:54:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

examine PATH instead of calling which

Browse source
This commit is contained in:
Brian Hicks 2022-11-01 22:00:18 -05:00
parent 50bde4e8b6
commit db8955d6b5
No known key found for this signature in database
GPG key ID: C4F324B9CAAB0D50
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/utils/src/lib.rs
View file

@ -1,5 +1,7 @@
use snafu::OptionExt; use snafu::OptionExt;
use std::{collections::HashMap, path::PathBuf, process::Command, slice::SliceIndex}; use std::{
collections::HashMap, env::VarError, path::PathBuf, process::Command, slice::SliceIndex,
};
use util_error::{IndexOfFailedSnafu, KeyNotFoundSnafu, OutOfBoundsSnafu, UtilResult}; use util_error::{IndexOfFailedSnafu, KeyNotFoundSnafu, OutOfBoundsSnafu, UtilResult};
pub mod util_error; pub mod util_error;
@ -163,20 +165,15 @@ pub fn zig() -> Command {
fn check_command_available(command_name: &str) -> bool { fn check_command_available(command_name: &str) -> bool {
if cfg!(target_family = "unix") { if cfg!(target_family = "unix") {
let mut cmd = Command::new("which"); let unparsed_path = match std::env::var("PATH") {
Ok(var) => var,
Err(VarError::NotPresent) => return false,
Err(VarError::NotUnicode(_)) => {
panic!("found PATH, but it included invalid unicode data!")
}
};
cmd.args([command_name]); std::env::split_paths(&unparsed_path).any(|dir| dir.join(command_name).exists())
let cmd_str = format!("{:?}", cmd);
let cmd_out = cmd.output().unwrap_or_else(|err| {
panic!(
"Failed to execute `{}` to check if {} is available:\n {}",
cmd_str, command_name, err
)
});
cmd_out.status.success()
} else if cfg!(target = "windows") { } else if cfg!(target = "windows") {
let mut cmd = Command::new("Get-Command"); let mut cmd = Command::new("Get-Command");