mirror of
https://github.com/TECHNOFAB11/pay-respects.git
synced 2025-12-12 06:20:09 +01:00
fix: possible panic
This commit is contained in:
parent
ab1c91fef9
commit
7a5357e2b1
2 changed files with 14 additions and 8 deletions
|
|
@ -127,7 +127,7 @@ pub fn cnf(data: &mut Data) {
|
||||||
let packages = match system::get_packages(data, &package_manager, executable) {
|
let packages = match system::get_packages(data, &package_manager, executable) {
|
||||||
Some(packages) => packages,
|
Some(packages) => packages,
|
||||||
None => {
|
None => {
|
||||||
eprintln!("{}: {}", "pay-respects".red(), t!("package-not-found"));
|
eprintln!("{} {}", "pay-respects:".red(), t!("package-not-found"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,9 @@ use std::process::Stdio;
|
||||||
|
|
||||||
pub fn get_package_manager(data: &mut Data) -> Option<String> {
|
pub fn get_package_manager(data: &mut Data) -> Option<String> {
|
||||||
if let Ok(package_manager) = std::env::var("_PR_PACKAGE_MANAGER") {
|
if let Ok(package_manager) = std::env::var("_PR_PACKAGE_MANAGER") {
|
||||||
|
if package_manager.is_empty() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
return Some(package_manager);
|
return Some(package_manager);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -32,8 +35,8 @@ pub fn get_packages(
|
||||||
"apt" => {
|
"apt" => {
|
||||||
if !data.executables.contains(&"apt-file".to_string()) {
|
if !data.executables.contains(&"apt-file".to_string()) {
|
||||||
eprintln!(
|
eprintln!(
|
||||||
"{}: apt-file is required to find packages",
|
"{} apt-file is required to find packages",
|
||||||
"pay-respects".yellow()
|
"pay-respects:".yellow()
|
||||||
);
|
);
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
@ -76,8 +79,8 @@ pub fn get_packages(
|
||||||
"emerge" => {
|
"emerge" => {
|
||||||
if !data.executables.contains(&"e-file".to_string()) {
|
if !data.executables.contains(&"e-file".to_string()) {
|
||||||
eprintln!(
|
eprintln!(
|
||||||
"{}: pfl is required to find packages",
|
"{} pfl is required to find packages",
|
||||||
"pay-respects".yellow()
|
"pay-respects:".yellow()
|
||||||
);
|
);
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
@ -100,8 +103,8 @@ pub fn get_packages(
|
||||||
"nix" => {
|
"nix" => {
|
||||||
if !data.executables.contains(&"nix-locate".to_string()) {
|
if !data.executables.contains(&"nix-locate".to_string()) {
|
||||||
eprintln!(
|
eprintln!(
|
||||||
"{}: nix-index is required to find packages",
|
"{} nix-index is required to find packages",
|
||||||
"pay-respects".yellow()
|
"pay-respects:".yellow()
|
||||||
);
|
);
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
@ -162,7 +165,10 @@ pub fn get_packages(
|
||||||
}
|
}
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
false => unreachable!("Unsupported package manager"),
|
false => {
|
||||||
|
eprintln!("{} Unsupported package manager", ":pay-respects".yellow());
|
||||||
|
return None;
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue