technofab/pay-respects
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/pay-respects.git synced 2025-12-11 22:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: cleanup

Browse source
This commit is contained in:
iff 2024-12-08 00:38:15 +01:00
parent b87f22975e
commit 1577ce400e
3 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/args.rs
View file

@ -1,7 +1,6 @@
use crate::shell::{initialization, Init};
use colored::Colorize;
pub enum Status {
Continue,
Exit, // version, help, etc.

2
src/shell.rs
View file

@ -226,7 +226,7 @@ pub fn command_output(shell: &str, command: &str) -> String {
.output()
.expect("failed to execute process");
String::from_utf8_lossy(&output.stdout).to_string()
String::from_utf8_lossy(&output.stdout).to_string()
}
pub fn last_command(shell: &str) -> String {

50
src/system.rs
View file

@ -1,15 +1,11 @@
use crate::shell::{Data, command_output, elevate};
use crate::shell::{command_output, elevate, Data};
use std::io::stderr;
use std::process::Command;
use std::process::Stdio;
pub fn get_package_manager(data: &mut Data) -> Option<String> {
let package_managers = vec![
"apt",
"dnf",
"emerge",
"nix",
"pacman",
"apt", "dnf", "emerge", "nix", "pacman",
// "pkg",
// "yum",
// "zypper",
@ -23,7 +19,11 @@ pub fn get_package_manager(data: &mut Data) -> Option<String> {
None
}
pub fn get_packages(data: &mut Data, package_manager: &str, executable: &str) -> Option<Vec<String>> {
pub fn get_packages(
data: &mut Data,
package_manager: &str,
executable: &str,
) -> Option<Vec<String>> {
let shell = &data.shell.clone();
match package_manager {
"apt" => {
@ -32,23 +32,23 @@ pub fn get_packages(data: &mut Data, package_manager: &str, executable: &str) ->
}
let result = command_output(shell, &format!("dpkg -S '*/bin/{}'", executable));
if result.is_empty() {
return None
return None;
}
let packages: Vec<String> = result
.lines()
.map(|line| line[..line.find(':').unwrap()].to_string())
.collect();
if packages.is_empty() {
None
} else {
Some(packages)
}
},
}
"dnf" => {
let result = command_output(shell, &format!("dnf provides {}", executable));
if result.is_empty() {
return None
return None;
}
let packages: Vec<String> = result
.lines()
@ -59,14 +59,14 @@ pub fn get_packages(data: &mut Data, package_manager: &str, executable: &str) ->
} else {
Some(packages)
}
},
}
"emerge" => {
if !data.has_executable("e-file") {
return None;
}
let result = command_output(shell, &format!("e-file /usr/bin/{}", executable));
if result.is_empty() {
return None
return None;
}
let mut packages = vec![];
for line in result.lines() {
@ -79,22 +79,26 @@ pub fn get_packages(data: &mut Data, package_manager: &str, executable: &str) ->
} else {
Some(packages)
}
},
}
"nix" => {
if !data.has_executable("nix-locate") {
return None;
}
let result = command_output(shell, &format!("nix-locate 'bin/{}'", executable));
if result.is_empty() {
return None
return None;
}
let packages: Vec<String> = result
.lines()
.map(|line| line
.split_whitespace()
.next().unwrap()
.rsplit_once('.')
.unwrap().0.to_string())
.map(|line| {
line.split_whitespace()
.next()
.unwrap()
.rsplit_once('.')
.unwrap()
.0
.to_string()
})
.collect();
if packages.is_empty() {
None
@ -105,11 +109,11 @@ pub fn get_packages(data: &mut Data, package_manager: &str, executable: &str) ->
"pacman" => {
let result = if data.has_executable("pkgfile") {
command_output(shell, &format!("pkgfile -b {}", executable))
} else{
} else {
command_output(shell, &format!("pacman -Fq /usr/bin/{}", executable))
};
if result.is_empty() {
return None
return None;
}
let packages: Vec<String> = result
.lines()
@ -120,7 +124,7 @@ pub fn get_packages(data: &mut Data, package_manager: &str, executable: &str) ->
} else {
Some(packages)
}
},
}
_ => unreachable!("Unsupported package manager"),
}
}