From 1a188977236ba6e1f34bfecb6634d931c5fad927 Mon Sep 17 00:00:00 2001 From: Adrian Groh Date: Thu, 16 Mar 2023 12:58:17 +0100 Subject: [PATCH] fix(lib): fix Bedrock Linux not being detected closes #17 --- src/lib.rs | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 57ddf95..9ae79aa 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -219,10 +219,20 @@ pub fn memory(memory_readout: &MemoryReadout) -> Option { pub fn os(general_readout: &GeneralReadout) -> Option { match env::consts::OS { - "linux" => match general_readout.distribution() { - Ok(distribution) => Some(distribution), - Err(_) => None, - }, + "linux" => { + // check for Bedrock Linux + if dotenvy::var("PATH") + .unwrap_or_default() + .contains("/bedrock/cross/") + { + Some("Bedrock Linux".to_string()) + } else { + match general_readout.distribution() { + Ok(distribution) => Some(distribution), + Err(_) => None, + } + } + } _ => match general_readout.os_name() { Ok(os) => Some(os), Err(_) => None,