Merge pull request #376 from stanislav-tkach/3-8-1-release

Release the 3.8.1 version

CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- Build on FreeSBD has been fixed. (#372)
+
+- Build on Illumos has been fixed. (#373)
+
+- Build on NetBSD has been fixed. (#374)
+
+- Few more regressions introduced in the `3.8.0` release were (hopefully) fixed.
+
+## [3.8.1] (2024-03-17)
+
 ## [3.8.0] (2024-03-12)
 
 - The `windows-sys` crate instead of `winapi` is now used internally. (#341)
@@ -317,7 +327,8 @@ All notable changes to this project will be documented in this file.
 
 The first release containing only minor infrastructural changes and based on [os_type](https://github.com/schultyy/os_type).
 
-[Unreleased]: https://github.com/stanislav-tkach/os_info/compare/v3.8.0...HEAD
+[Unreleased]: https://github.com/stanislav-tkach/os_info/compare/v3.8.1...HEAD
+[3.8.1]: https://github.com/stanislav-tkach/os_info/compare/v3.8.0...v3.8.1
 [3.8.0]: https://github.com/stanislav-tkach/os_info/compare/v3.7.0...v3.8.0
 [3.7.0]: https://github.com/stanislav-tkach/os_info/compare/v3.6.0...v3.7.0
 [3.6.0]: https://github.com/stanislav-tkach/os_info/compare/v3.5.1...v3.6.0

cli/Cargo.toml

@@ -18,7 +18,7 @@ name = "os_info"
 path = "src/main.rs"
 
 [dependencies]
-os_info = { version = "3.8.0", default-features = false, path = "../os_info" }
+os_info = { version = "3.8.1", default-features = false, path = "../os_info" }
 log.workspace = true
 env_logger = "0.11"
 clap = { version = "4", features = ["derive"] }

os_info/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "os_info"
-version = "3.8.0"
+version = "3.8.1"
 authors = ["Jan Schulte <[email protected]>", "Stanislav Tkach <[email protected]>"]
 description = "Detect the operating system type and version."
 documentation = "https://docs.rs/os_info"

os_info/src/aix/mod.rs

@@ -29,9 +29,9 @@ fn get_version() -> Option<String> {
 }
 
 fn get_os() -> Type {
-    match uname("-o") {
+    match uname("-o").as_deref() {
         Some("AIX") => Type::AIX,
-        None => Type::Unknown,
+        _ => Type::Unknown,
     }
 }
 

os_info/src/dragonfly/mod.rs

@@ -7,7 +7,7 @@ use crate::{bitness, uname::uname, Bitness, Info, Type, Version};
 pub fn current_platform() -> Info {
     trace!("dragonfly::current_platform is called");
 
-    let version = uname()
+    let version = uname("-r")
         .map(Version::from_string)
         .unwrap_or_else(|| Version::Unknown);
 

os_info/src/freebsd/mod.rs

@@ -24,12 +24,7 @@ pub fn current_platform() -> Info {
 }
 
 fn get_os() -> Type {
-    let os = match uname("-s") {
-        Some(o) => o,
-        None => return Type::Unknown,
-    };
-
-    match os.as_str() {
+    match uname("-s").as_deref() {
         "MidnightBSD" => Type::MidnightBSD,
         "FreeBSD" => {
             let check_hardening = match Command::new("/sbin/sysctl")
@@ -47,8 +42,8 @@ fn get_os() -> Type {
                 Ok(_) => Type::FreeBSD,
                 Err(_) => Type::FreeBSD,
             }
-        },
-        _ => Type::Unknown
+        }
+        _ => Type::Unknown,
     }
 }
 

os_info/src/illumos/mod.rs

@@ -8,7 +8,7 @@ use crate::{bitness, uname::uname, Info, Type, Version};
 pub fn current_platform() -> Info {
     trace!("illumos::current_platform is called");
 
-    let version = get_version()
+    let version = uname("-v")
         .map(Version::from_string)
         .unwrap_or_else(|| Version::Unknown);
 
@@ -23,19 +23,10 @@ pub fn current_platform() -> Info {
     info
 }
 
-fn get_version() -> Option<String> {
-    uname("-v")
-}
-
 fn get_os() -> Type {
-    let os = match uname("-o") {
-        Some(o) => o,
-        None => return Type::Unknown,
-    };
-
-    match os.as_str() {
+    match uname("-o").as_deref() {
         "illumos" => Type::Illumos,
-        _ => Type::Unknown
+        _ => Type::Unknown,
     }
 }
 

os_info/src/openbsd/mod.rs

@@ -7,7 +7,7 @@ use crate::{architecture, bitness, uname::uname, Info, Type, Version};
 pub fn current_platform() -> Info {
     trace!("openbsd::current_platform is called");
 
-    let version = uname()
+    let version = uname("-r")
         .map(Version::from_string)
         .unwrap_or_else(|| Version::Unknown);