Code cleanup : made each update tool into a function.

This commit is contained in:
Andrew Schott 2024-08-20 20:49:00 -05:00
parent 9a7c029754
commit e0bcfef2c3

View file

@ -2,7 +2,7 @@ use std::process::{Command, Stdio};
use std::path::Path; use std::path::Path;
use color_print::cprintln; use color_print::cprintln;
//use std::io::{stdin,stdout,Write}; //use std::io::{stdin,stdout,Write};
use input_validation::{get_choice}; //use input_validation::{get_choice};
fn trim_newline(s: &mut String) { fn trim_newline(s: &mut String) {
if s.ends_with('\n') { if s.ends_with('\n') {
@ -13,21 +13,7 @@ fn trim_newline(s: &mut String) {
} }
} }
fn main() { fn update_apt() {
{
//Clear termianl, and move cursor to 1,1 inside the terminal
print!("{esc}[2J{esc}[1;1H", esc = 27 as char);
// Tell user that we are going to start the update procedure
cprintln!("<bold><rev>osupdater : This tool will locate and run any package/container managers on your system.</rev></bold>\n");
cprintln!("<bold><rev>Looking for native package managers.</rev></bold>\n");
//Figure out if the program should ask if an update tool should be run
//let autoupdate_choices = vec!["Y","N"];
//let autoupdate_index = get_choice("Shall the application autorun each update tool?", &autoupdate_choices);
//println!("Selection was {}", autoupdate_choices[autoupdate_index]);
//Find if binaries exist and their location
let find_sudo = Command::new("which") let find_sudo = Command::new("which")
.arg("sudo").stdout(Stdio::piped()).output().unwrap(); .arg("sudo").stdout(Stdio::piped()).output().unwrap();
let mut sudo_bin = String::from_utf8(find_sudo.stdout).unwrap(); let mut sudo_bin = String::from_utf8(find_sudo.stdout).unwrap();
@ -38,57 +24,6 @@ fn main() {
let mut apt_bin = String::from_utf8(find_apt.stdout).unwrap(); let mut apt_bin = String::from_utf8(find_apt.stdout).unwrap();
trim_newline(&mut apt_bin); trim_newline(&mut apt_bin);
let find_dnf5 = Command::new("which")
.arg("dnf5").stdout(Stdio::piped()).output().unwrap();
let mut dnf5_bin = String::from_utf8(find_dnf5.stdout).unwrap();
trim_newline(&mut dnf5_bin);
let find_dnf = Command::new("which")
.arg("dnf").stdout(Stdio::piped()).output().unwrap();
let mut dnf_bin = String::from_utf8(find_dnf.stdout).unwrap();
trim_newline(&mut dnf_bin);
let find_pacman = Command::new("which")
.arg("pacman").stdout(Stdio::piped()).output().unwrap();
let mut pacman_bin = String::from_utf8(find_pacman.stdout).unwrap();
trim_newline(&mut pacman_bin);
let find_urpmi = Command::new("which")
.arg("urpmi").stdout(Stdio::piped()).output().unwrap();
let mut urpmi_bin = String::from_utf8(find_urpmi.stdout).unwrap();
trim_newline(&mut urpmi_bin);
let find_zypper = Command::new("which")
.arg("zypper").stdout(Stdio::piped()).output().unwrap();
let mut zypper_bin = String::from_utf8(find_zypper.stdout).unwrap();
trim_newline(&mut zypper_bin);
let find_flatpak = Command::new("which")
.arg("flatpak").stdout(Stdio::piped()).output().unwrap();
let mut flatpak_bin = String::from_utf8(find_flatpak.stdout).unwrap();
trim_newline(&mut flatpak_bin);
let find_snap = Command::new("which")
.arg("snap").stdout(Stdio::piped()).output().unwrap();
let mut snap_bin = String::from_utf8(find_snap.stdout).unwrap();
trim_newline(&mut snap_bin);
let find_pip_review = Command::new("which")
.arg("pip-review").stdout(Stdio::piped()).output().unwrap();
let mut pip_review_bin = String::from_utf8(find_pip_review.stdout).unwrap();
trim_newline(&mut pip_review_bin);
let find_distrobox_upgrade = Command::new("which")
.arg("distrobox-upgrade").stdout(Stdio::piped()).output().unwrap();
let mut distrobox_upgrade_bin = String::from_utf8(find_distrobox_upgrade.stdout).unwrap();
trim_newline(&mut distrobox_upgrade_bin);
let find_podman = Command::new("which")
.arg("podman").stdout(Stdio::piped()).output().unwrap();
let mut podman_bin = String::from_utf8(find_podman.stdout).unwrap();
trim_newline(&mut podman_bin);
//apt
let path = Path::new(&apt_bin); let path = Path::new(&apt_bin);
if path.exists(){ if path.exists(){
cprintln!("<bold><rev>Updating via: apt</rev></bold>"); cprintln!("<bold><rev>Updating via: apt</rev></bold>");
@ -105,14 +40,37 @@ fn main() {
.spawn().unwrap(); .spawn().unwrap();
let _output = cmd.wait(); let _output = cmd.wait();
} }
}
// dnf fn update_dnf() {
let path = Path::new(&dnf_bin); let find_sudo = Command::new("which")
.arg("sudo").stdout(Stdio::piped()).output().unwrap();
let mut sudo_bin = String::from_utf8(find_sudo.stdout).unwrap();
trim_newline(&mut sudo_bin);
let find_dnf5 = Command::new("which")
.arg("dnf5").stdout(Stdio::piped()).output().unwrap();
let mut dnf5_bin = String::from_utf8(find_dnf5.stdout).unwrap();
trim_newline(&mut dnf5_bin);
let find_dnf = Command::new("which")
.arg("dnf").stdout(Stdio::piped()).output().unwrap();
let mut dnf_bin = String::from_utf8(find_dnf.stdout).unwrap();
trim_newline(&mut dnf_bin);
let path_dnf = Path::new(&dnf_bin);
let path_dnf5 = Path::new(&dnf5_bin); let path_dnf5 = Path::new(&dnf5_bin);
if path_dnf5.exists() { if path_dnf5.exists() {
cprintln!("<bold><rev>dnf found but skipped since dnf5 is present</rev></bold>") cprintln!("<bold><rev>dnf found but skipped since dnf5 is present</rev></bold>");
} else if path.exists(){ cprintln!("<bold><rev>Updating via: dnf5</rev></bold>");
let mut cmd =
Command::new(&sudo_bin)
.arg(&dnf5_bin).arg("--refresh").arg("--nobest").arg("-y").arg("update")
.stdout(Stdio::inherit()).stderr(Stdio::inherit())
.spawn().unwrap();
let _output = cmd.wait();
} else if path_dnf.exists(){
cprintln!("<bold><rev>Updating via: dnf</rev></bold>"); cprintln!("<bold><rev>Updating via: dnf</rev></bold>");
let mut cmd = let mut cmd =
Command::new(&sudo_bin) Command::new(&sudo_bin)
@ -122,19 +80,19 @@ fn main() {
let _output = cmd.wait(); let _output = cmd.wait();
} }
// dnf5 }
let path = Path::new(&dnf5_bin);
if path.exists(){ fn update_pacman() {
cprintln!("<bold><rev>Updating via: dnf5</rev></bold>"); let find_sudo = Command::new("which")
let mut cmd = .arg("sudo").stdout(Stdio::piped()).output().unwrap();
Command::new(&sudo_bin) let mut sudo_bin = String::from_utf8(find_sudo.stdout).unwrap();
.arg(&dnf5_bin).arg("--refresh").arg("--nobest").arg("-y").arg("update") trim_newline(&mut sudo_bin);
.stdout(Stdio::inherit()).stderr(Stdio::inherit())
.spawn().unwrap(); let find_pacman = Command::new("which")
let _output = cmd.wait(); .arg("pacman").stdout(Stdio::piped()).output().unwrap();
} let mut pacman_bin = String::from_utf8(find_pacman.stdout).unwrap();
trim_newline(&mut pacman_bin);
// pacman
let path = Path::new(&pacman_bin); let path = Path::new(&pacman_bin);
if path.exists(){ if path.exists(){
cprintln!("<bold><rev>Updating via: pacman</rev></bold>"); cprintln!("<bold><rev>Updating via: pacman</rev></bold>");
@ -146,7 +104,19 @@ fn main() {
let _output = cmd.wait(); let _output = cmd.wait();
} }
// urpmi }
fn update_urpmi() {
let find_sudo = Command::new("which")
.arg("sudo").stdout(Stdio::piped()).output().unwrap();
let mut sudo_bin = String::from_utf8(find_sudo.stdout).unwrap();
trim_newline(&mut sudo_bin);
let find_urpmi = Command::new("which")
.arg("urpmi").stdout(Stdio::piped()).output().unwrap();
let mut urpmi_bin = String::from_utf8(find_urpmi.stdout).unwrap();
trim_newline(&mut urpmi_bin);
let path = Path::new(&urpmi_bin); let path = Path::new(&urpmi_bin);
if path.exists(){ if path.exists(){
cprintln!("<bold><rev>Updating via urpmi</rev></bold>"); cprintln!("<bold><rev>Updating via urpmi</rev></bold>");
@ -157,8 +127,19 @@ fn main() {
.spawn().unwrap(); .spawn().unwrap();
let _output = cmd.wait(); let _output = cmd.wait();
} }
}
fn update_zypper() {
let find_sudo = Command::new("which")
.arg("sudo").stdout(Stdio::piped()).output().unwrap();
let mut sudo_bin = String::from_utf8(find_sudo.stdout).unwrap();
trim_newline(&mut sudo_bin);
let find_zypper = Command::new("which")
.arg("zypper").stdout(Stdio::piped()).output().unwrap();
let mut zypper_bin = String::from_utf8(find_zypper.stdout).unwrap();
trim_newline(&mut zypper_bin);
// zypper
let path = Path::new(&zypper_bin); let path = Path::new(&zypper_bin);
if path.exists(){ if path.exists(){
cprintln!("<bold><rev>Updating via: zypper</rev></bold>"); cprintln!("<bold><rev>Updating via: zypper</rev></bold>");
@ -169,11 +150,24 @@ fn main() {
.spawn().unwrap(); .spawn().unwrap();
let _output = cmd.wait(); let _output = cmd.wait();
} }
}
// Check container formats fn update_flatpak() {
cprintln!("<bold><rev>Checking application containers</rev></bold>"); let find_sudo = Command::new("which")
.arg("sudo").stdout(Stdio::piped()).output().unwrap();
let mut sudo_bin = String::from_utf8(find_sudo.stdout).unwrap();
trim_newline(&mut sudo_bin);
let find_sudo = Command::new("which")
.arg("sudo").stdout(Stdio::piped()).output().unwrap();
let mut sudo_bin = String::from_utf8(find_sudo.stdout).unwrap();
trim_newline(&mut sudo_bin);
let find_flatpak = Command::new("which")
.arg("flatpak").stdout(Stdio::piped()).output().unwrap();
let mut flatpak_bin = String::from_utf8(find_flatpak.stdout).unwrap();
trim_newline(&mut flatpak_bin);
// flatpak
let path = Path::new(&flatpak_bin); let path = Path::new(&flatpak_bin);
if path.exists(){ if path.exists(){
cprintln!("<bold><rev>Updating user flatpak installs</rev></bold>"); cprintln!("<bold><rev>Updating user flatpak installs</rev></bold>");
@ -194,8 +188,19 @@ fn main() {
.spawn().unwrap(); .spawn().unwrap();
let _output = cmd.wait(); let _output = cmd.wait();
} }
}
fn update_snap() {
let find_sudo = Command::new("which")
.arg("sudo").stdout(Stdio::piped()).output().unwrap();
let mut sudo_bin = String::from_utf8(find_sudo.stdout).unwrap();
trim_newline(&mut sudo_bin);
let find_snap = Command::new("which")
.arg("snap").stdout(Stdio::piped()).output().unwrap();
let mut snap_bin = String::from_utf8(find_snap.stdout).unwrap();
trim_newline(&mut snap_bin);
// snap
let path = Path::new(&snap_bin); let path = Path::new(&snap_bin);
if path.exists(){ if path.exists(){
cprintln!("<bold><rev>Updating user snap installation</rev></bold>"); cprintln!("<bold><rev>Updating user snap installation</rev></bold>");
@ -216,8 +221,14 @@ fn main() {
.spawn().unwrap(); .spawn().unwrap();
let _output = cmd.wait(); let _output = cmd.wait();
} }
}
fn update_python() {
let find_pip_review = Command::new("which")
.arg("pip-review").stdout(Stdio::piped()).output().unwrap();
let mut pip_review_bin = String::from_utf8(find_pip_review.stdout).unwrap();
trim_newline(&mut pip_review_bin);
//Python
let path = Path::new(&pip_review_bin); let path = Path::new(&pip_review_bin);
if path.exists(){ if path.exists(){
cprintln!("<bold><rev>Updating Python user installation via pip-review</rev></bold>"); cprintln!("<bold><rev>Updating Python user installation via pip-review</rev></bold>");
@ -228,8 +239,14 @@ fn main() {
.spawn().unwrap(); .spawn().unwrap();
let _output = cmd.wait(); let _output = cmd.wait();
} }
}
fn update_distrobox() {
let find_distrobox_upgrade = Command::new("which")
.arg("distrobox-upgrade").stdout(Stdio::piped()).output().unwrap();
let mut distrobox_upgrade_bin = String::from_utf8(find_distrobox_upgrade.stdout).unwrap();
trim_newline(&mut distrobox_upgrade_bin);
//Distrobox
let path = Path::new(&distrobox_upgrade_bin); let path = Path::new(&distrobox_upgrade_bin);
if path.exists(){ if path.exists(){
cprintln!("<bold><rev>Updating Distrobox containers</rev></bold>"); cprintln!("<bold><rev>Updating Distrobox containers</rev></bold>");
@ -240,8 +257,19 @@ fn main() {
.spawn().unwrap(); .spawn().unwrap();
let _output = cmd.wait(); let _output = cmd.wait();
} }
}
fn update_podman() {
let find_sudo = Command::new("which")
.arg("sudo").stdout(Stdio::piped()).output().unwrap();
let mut sudo_bin = String::from_utf8(find_sudo.stdout).unwrap();
trim_newline(&mut sudo_bin);
let find_podman = Command::new("which")
.arg("podman").stdout(Stdio::piped()).output().unwrap();
let mut podman_bin = String::from_utf8(find_podman.stdout).unwrap();
trim_newline(&mut podman_bin);
//Podman system
let path = Path::new(&podman_bin); let path = Path::new(&podman_bin);
if path.exists(){ if path.exists(){
cprintln!("<bold><rev>Updating Podman system containers</rev></bold>"); cprintln!("<bold><rev>Updating Podman system containers</rev></bold>");
@ -253,8 +281,6 @@ fn main() {
let _output = cmd.wait(); let _output = cmd.wait();
} }
//Podman user
let path = Path::new(&podman_bin);
if path.exists(){ if path.exists(){
cprintln!("<bold><rev>Updating Podman user containers</rev></bold>"); cprintln!("<bold><rev>Updating Podman user containers</rev></bold>");
let mut cmd = let mut cmd =
@ -265,8 +291,6 @@ fn main() {
let _output = cmd.wait(); let _output = cmd.wait();
} }
//Podman system prune
let path = Path::new(&podman_bin);
if path.exists(){ if path.exists(){
cprintln!("<bold><rev>Pruning Podman system containers</rev></bold>"); cprintln!("<bold><rev>Pruning Podman system containers</rev></bold>");
let mut cmd = let mut cmd =
@ -277,8 +301,6 @@ fn main() {
let _output = cmd.wait(); let _output = cmd.wait();
} }
//Podman user prune
let path = Path::new(&podman_bin);
if path.exists(){ if path.exists(){
cprintln!("<bold><rev>Pruning Podman user containers</rev></bold>"); cprintln!("<bold><rev>Pruning Podman user containers</rev></bold>");
let mut cmd = let mut cmd =
@ -288,5 +310,38 @@ fn main() {
.spawn().unwrap(); .spawn().unwrap();
let _output = cmd.wait(); let _output = cmd.wait();
} }
} }
fn main() {
//Clear termianl, and move cursor to 1,1 inside the terminal
print!("{esc}[2J{esc}[1;1H", esc = 27 as char);
// Tell user that we are going to start the update procedure
cprintln!("<bold><rev>osupdater : This tool will locate and run any package/container managers on your system.</rev></bold>\n");
//Figure out if the program should ask if an update tool should be run
//let autoupdate_choices = vec!["Y","N"];
//let autoupdate_index = get_choice("Shall the application autorun each update tool?", &autoupdate_choices);
//println!("Selection was {}", autoupdate_choices[autoupdate_index]);
// Find sudo
let find_sudo = Command::new("which")
.arg("sudo").stdout(Stdio::piped()).output().unwrap();
let mut sudo_bin = String::from_utf8(find_sudo.stdout).unwrap();
trim_newline(&mut sudo_bin);
// Check package managers
cprintln!("<bold><rev>Looking for native package managers.</rev></bold>\n");
update_apt();
update_dnf();
update_pacman();
update_urpmi();
update_zypper();
// Check container formats
cprintln!("<bold><rev>Checking application containers</rev></bold>");
update_flatpak();
update_snap();
update_python();
update_distrobox();
update_podman();
} }