admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Linux Mint

Browse Source
This commit is contained in:
Roey Darwish Dror
2019-05-13 08:25:25 +03:00
parent f270446852
commit 6b18ed0faa
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/steps/os/linux.rs
View File

@@ -36,26 +36,18 @@ impl Distribution {
serde_ini::de::from_read(fs::File::open(OS_RELEASE_PATH).context(ErrorKind::UnknownLinuxDistribution)?) serde_ini::de::from_read(fs::File::open(OS_RELEASE_PATH).context(ErrorKind::UnknownLinuxDistribution)?)
.context(ErrorKind::UnknownLinuxDistribution)?; .context(ErrorKind::UnknownLinuxDistribution)?;
match os_release.id_like.as_ref().map(String::as_str) { Ok(
Some("debian") => { match (os_release.id.as_ref(), os_release.id_like.as_ref().map(String::as_str)) {
return Ok(Distribution::Debian); (_, Some("debian")) | (_, Some("ubuntu")) => Distribution::Debian,
} (_, Some("\"suse\"")) => Distribution::Suse,
Some("\"suse\"") => { ("arch", _) => Distribution::Arch,
return Ok(Distribution::Suse); ("centos", _) | ("\"ol\"", _) => Distribution::CentOS,
} ("fedora", _) => Distribution::Fedora,
_ => (), ("void", _) => Distribution::Void,
} ("solus", _) => Distribution::Solus,
_ => Err(ErrorKind::UnknownLinuxDistribution)?,
if let Some("debian") = os_release.id_like.as_ref().map(String::as_str) {} },
)
Ok(match os_release.id.as_ref() {
"arch" => Distribution::Arch,
"centos" | "\"ol\"" => Distribution::CentOS,
"fedora" => Distribution::Fedora,
"void" => Distribution::Void,
"solus" => Distribution::Solus,
_ => Err(ErrorKind::UnknownLinuxDistribution)?,
})
} }
pub fn detect() -> Result<Self, Error> { pub fn detect() -> Result<Self, Error> {