ellie/atuin
1
1
Fork 0
mirror of https://github.com/ellie/atuin.git synced 2024-10-27 07:40:53 +03:00
Code Issues Projects Releases Wiki Activity

fix(doctor): use a different method to detect env vars (#1819)

Browse Source
This commit is contained in:
Ellie Huxtable 2024-03-04 17:50:30 +00:00 committed by GitHub
parent ede5a5febf
commit b1155873dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
atuin/src/command/client/doctor.rs
View File

@ -25,17 +25,18 @@ impl ShellInfo {
// //
// Every shell we support handles `shell -c 'command'` // Every shell we support handles `shell -c 'command'`
fn env_exists(shell: &str, var: &str) -> bool { fn env_exists(shell: &str, var: &str) -> bool {
let mut cmd = Command::new(shell) let cmd = Command::new(shell)
.args(["-ic", format!("echo ${var}").as_str()]) .args([
"-ic",
format!("[ -z ${var} ] || echo ATUIN_DOCTOR_ENV_FOUND").as_str(),
])
.output() .output()
.map_or(String::new(), |v| { .map_or(String::new(), |v| {
let out = v.stdout; let out = v.stdout;
String::from_utf8(out).unwrap_or_default() String::from_utf8(out).unwrap_or_default()
}); });
cmd.retain(|c| !c.is_whitespace()); cmd.contains("ATUIN_DOCTOR_ENV_FOUND")
!cmd.is_empty()
} }
pub fn plugins(shell: &str) -> Vec<String> { pub fn plugins(shell: &str) -> Vec<String> {