Merge pull request #328 from leavelet/master

Add openEuler and OpenCloudOS support

os_info/src/info.rs

@@ -205,6 +205,8 @@ mod tests {
             Type::Manjaro,
             Type::Mariner,
             Type::NixOS,
+            Type::OpenCloudOS,
+            Type::openEuler,
             Type::openSUSE,
             Type::OracleLinux,
             Type::Pop,

os_info/src/linux/file_release.rs

@@ -115,6 +115,8 @@ static DISTRIBUTIONS: [ReleaseInfo; 6] = [
                     "mariner" => Some(Type::Mariner),
                     //"nexus" => Nexus
                     "nixos" => Some(Type::NixOS),
+                    "opencloudos" => Some(Type::OpenCloudOS),
+                    "openEuler" => Some(Type::openEuler),
                     "ol" => Some(Type::OracleLinux),
                     "opensuse" => Some(Type::openSUSE),
                     "opensuse-leap" => Some(Type::openSUSE),
@@ -398,6 +400,29 @@ mod tests {
         assert_eq!(info, None);
     }
 
+    #[test]
+    fn opencloudos_os_release() {
+        let root = "src/linux/tests/OpenCloudOS";
+
+        let info = retrieve(&DISTRIBUTIONS, root).unwrap();
+        assert_eq!(info.os_type(), Type::OpenCloudOS);
+        assert_eq!(info.version, Version::Semantic(8, 6, 0));
+        assert_eq!(info.edition, None);
+        assert_eq!(info.codename, None);
+    }
+
+    #[test]
+    fn openeuler_os_release() {
+        let root = "src/linux/tests/openEuler";
+
+        let info = retrieve(&DISTRIBUTIONS, root).unwrap();
+        assert_eq!(info.os_type(), Type::openEuler);
+        assert_eq!(info.version, Version::Semantic(22, 3, 0));
+        assert_eq!(info.edition, None);
+        assert_eq!(info.codename, None);
+
+    }
+
     #[test]
     fn oracle_linux_os_release() {
         let root = "src/linux/tests/OracleLinux";

os_info/src/linux/lsb_release.rs

@@ -28,6 +28,8 @@ pub fn get() -> Option<Info> {
         Some("ManjaroLinux") => Type::Manjaro,
         Some("Mariner") => Type::Mariner,
         Some("NixOS") => Type::NixOS,
+        Some("OpenCloudOS") => Type::OpenCloudOS,
+        Some("openEuler") => Type::openEuler,
         Some("openSUSE") => Type::openSUSE,
         Some("OracleServer") => Type::OracleLinux,
         Some("Pop") => Type::Pop,

os_info/src/linux/mod.rs

@@ -38,6 +38,8 @@ mod tests {
             | Type::Manjaro
             | Type::Mariner
             | Type::NixOS
+            | Type::OpenCloudOS
+            | Type::openEuler
             | Type::openSUSE
             | Type::OracleLinux
             | Type::Pop

os_info/src/linux/tests/OpenCloudOS/etc/os-release

@@ -0,0 +1,9 @@
+NAME="OpenCloudOS"
+VERSION="8.6"
+ID="opencloudos"
+ID_LIKE="rhel fedora centos"
+VERSION_ID="8.6"
+PLATFORM_ID="platform:oc8"
+PRETTY_NAME="OpenCloudOS 8.6"
+ANSI_COLOR="0;31"
+CPE_NAME="cpe:/o:opencloudos:opencloudos:8"

os_info/src/linux/tests/openEuler/etc/os-release

@@ -0,0 +1,6 @@
+NAME="openEuler"
+VERSION="22.03 LTS"
+ID="openEuler"
+VERSION_ID="22.03"
+PRETTY_NAME="openEuler 22.03 LTS"
+ANSI_COLOR="0;31"

os_info/src/os_type.rs

@@ -54,6 +54,10 @@ pub enum Type {
     NixOS,
     /// OpenBSD (<https://en.wikipedia.org/wiki/OpenBSD>).
     OpenBSD,
+    /// OpenCloudOS (<https://www.opencloudos.org>).
+    OpenCloudOS,
+    /// openEuler (<https://en.wikipedia.org/wiki/EulerOS>).
+    openEuler,
     /// openSUSE (<https://en.wikipedia.org/wiki/OpenSUSE>).
     openSUSE,
     /// Oracle Linux (<https://en.wikipedia.org/wiki/Oracle_Linux>).