Merge pull request #27 from liushuyu/main

macchina-read: more robust distribution detection using os-release crate

Author: grtcdr

Cargo.lock

@@ -17,6 +17,9 @@ windows = "0.4.0"
 [target.'cfg(any(target_os = "linux", target_os = "netbsd"))'.dependencies]
 nix = "0.20.0"
 
+[target.'cfg(target_os = "linux")'.dependencies]
+os-release = "0.1"
+
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.9.1"
 mach = "0.3.2"

macchina-read/Cargo.toml

@@ -31,25 +31,10 @@ pub(crate) fn uptime() -> Result<String, ReadoutError> {
 /// Read distribution name from `/etc/os-release`
 #[cfg(any(target_os = "linux", target_os = "netbsd"))]
 pub(crate) fn distribution() -> Result<String, ReadoutError> {
-    let content = fs::File::open("/etc/os-release")?;
+    use os_release::OsRelease;
+    let content = OsRelease::new()?;
 
-    let head = Command::new("head")
-        .args(&["-n", "1"])
-        .stdin(Stdio::from(content))
-        .stdout(Stdio::piped())
-        .spawn()
-        .expect("ERROR: failed to start \"head\" process");
-
-    let output = head
-        .wait_with_output()
-        .expect("ERROR: failed to wait for \"head\" process to exit");
-
-    let distribution =
-        String::from_utf8(output.stdout).expect("ERROR: \"ps\" process stdout was not valid UTF-8");
-
-    Ok(extra::pop_newline(
-        distribution.replace("\"", "").replace("NAME=", ""),
-    ))
+    Ok(content.name)
 }
 
 /// Read desktop environment name from `DESKTOP_SESSION` environment variable