technofab/pay-respects
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/pay-respects.git synced 2026-02-02 15:45:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: output and remove pkgfile

Browse source
This commit is contained in:
iff 2024-12-07 23:43:51 +01:00
parent 7e84862558
commit 5c919ad940
3 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modes.rs
View file

@ -121,7 +121,7 @@ pub fn cnf(data: &mut Data) {
.unwrap(); .unwrap();
// retry after installing package // retry after installing package
if system::install_package(&shell, &package_manager, &package) { if system::install_package(data, &package_manager, &package) {
let _ = suggestions::run_suggestion(data, &data.command); let _ = suggestions::run_suggestion(data, &data.command);
} }
} }

9
src/shell.rs
View file

@ -167,6 +167,15 @@ pub fn split_command(command: &str) -> Vec<String> {
split_command split_command
} }
pub fn elevate(data: &mut Data, command: &mut String) {
for privilege in PRIVILEGE_LIST.iter() {
if data.has_executable(privilege) {
*command = format!("{} {}", privilege, command);
break;
}
}
}
pub fn get_error(shell: &str, command: &str) -> String { pub fn get_error(shell: &str, command: &str) -> String {
let error_msg = std::env::var("_PR_ERROR_MSG"); let error_msg = std::env::var("_PR_ERROR_MSG");
let error = if let Ok(error_msg) = error_msg { let error = if let Ok(error_msg) = error_msg {

35
src/system.rs
View file

@ -1,4 +1,4 @@
use crate::shell::{Data, command_output}; use crate::shell::{Data, command_output, elevate};
use std::io::stderr; use std::io::stderr;
use std::process::Command; use std::process::Command;
use std::process::Stdio; use std::process::Stdio;
@ -87,11 +87,10 @@ pub fn get_packages(data: &mut Data, package_manager: &str, executable: &str) ->
} }
} }
"pacman" => { "pacman" => {
let result = if data.has_executable("pkgfile") { // somehow it tries to always update, so very slow
command_output(shell, &format!("pkgfile -b {}", executable)) // let result = if data.has_executable("pkgfile") {
} else { // command_output(shell, &format!("pkgfile -b {}", executable))
command_output(shell, &format!("pacman -Fq /usr/bin/{}", executable)) let result = command_output(shell, &format!("pacman -Fq /usr/bin/{}", executable));
};
let packages: Vec<String> = result let packages: Vec<String> = result
.lines() .lines()
.map(|line| line.split_whitespace().next().unwrap().to_string()) .map(|line| line.split_whitespace().next().unwrap().to_string())
@ -106,24 +105,26 @@ pub fn get_packages(data: &mut Data, package_manager: &str, executable: &str) ->
} }
} }
pub fn install_package(shell: &str, package_manager: &str, package: &str) -> bool { pub fn install_package(data: &mut Data, package_manager: &str, package: &str) -> bool {
let install = match package_manager { let shell = &data.shell.clone();
"apt" => format!("sudo apt install {}", package), let mut install = match package_manager {
"dnf" => format!("sudo dnf install {}", package), "apt" => format!("apt install {}", package),
"emerge" => format!("sudo emerge {}", package), "dnf" => format!("dnf install {}", package),
"emerge" => format!("emerge {}", package),
"nix-env" => format!("nix-env -iA {}", package), "nix-env" => format!("nix-env -iA {}", package),
"pacman" => format!("sudo pacman -S {}", package), "pacman" => format!("pacman -S {}", package),
"pkg" => format!("sudo pkg install {}", package), "pkg" => format!("pkg install {}", package),
"yum" => format!("sudo yum install {}", package), "yum" => format!("yum install {}", package),
"zypper" => format!("sudo zypper install {}", package), "zypper" => format!("zypper install {}", package),
_ => unreachable!("Unsupported package manager"), _ => unreachable!("Unsupported package manager"),
}; };
elevate(data, &mut install);
let result = Command::new(shell) let result = Command::new(shell)
.arg("-c") .arg("-c")
.arg(install) .arg(install)
.stdout(Stdio::null()) .stdout(stderr())
.stderr(Stdio::null()) .stderr(Stdio::inherit())
.status() .status()
.expect("failed to execute process"); .expect("failed to execute process");