From aed18426f77bf0ed7a97cbda46a8480386aafd99 Mon Sep 17 00:00:00 2001 From: Roey Darwish Dror Date: Sat, 17 Aug 2019 20:58:54 +0300 Subject: [PATCH] Detect arch32 (fix #195) --- src/steps/os/linux.rs | 9 ++++++--- src/steps/os/os_release/arch32 | 11 +++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 src/steps/os/os_release/arch32 diff --git a/src/steps/os/linux.rs b/src/steps/os/linux.rs index b2cef588..ecdb1515 100644 --- a/src/steps/os/linux.rs +++ b/src/steps/os/linux.rs @@ -40,9 +40,11 @@ impl Distribution { Ok(match (id, id_like) { (Some("debian"), _) | (_, Some("debian")) | (_, Some("ubuntu")) => Distribution::Debian, (_, Some("suse")) => Distribution::Suse, - (Some("arch"), _) | (_, Some("archlinux")) | (_, Some("arch")) | (_, Some("anarchylinux")) => { - Distribution::Arch - } + (Some("arch"), _) + | (Some("arch32"), _) + | (_, Some("archlinux")) + | (_, Some("arch")) + | (_, Some("anarchylinux")) => Distribution::Arch, (Some("centos"), _) | (Some("ol"), _) => Distribution::CentOS, (Some("fedora"), _) => Distribution::Fedora, (Some("void"), _) => Distribution::Void, @@ -350,6 +352,7 @@ mod tests { #[test] fn test_arch_linux() { test_template(&include_str!("os_release/arch"), Distribution::Arch); + test_template(&include_str!("os_release/arch32"), Distribution::Arch); } #[test] diff --git a/src/steps/os/os_release/arch32 b/src/steps/os/os_release/arch32 new file mode 100644 index 00000000..36f4a849 --- /dev/null +++ b/src/steps/os/os_release/arch32 @@ -0,0 +1,11 @@ +NAME="Arch Linux 32" +PRETTY_NAME="Arch Linux 32" +ID=arch32 +ID_LIKE="arch archlinux" +BUILD_ID=rolling +ANSI_COLOR="0;36" +HOME_URL="https://www.archlinux32.org/" +DOCUMENTATION_URL="https://wiki.archlinux.org/" +SUPPORT_URL="https://bbs.archlinux32.org/" +BUG_REPORT_URL="https://bugs.archlinux32.org/" +LOGO=archlinux \ No newline at end of file