diff --git a/assets/arch.png b/antiquated/assets/arch.png similarity index 100% rename from assets/arch.png rename to antiquated/assets/arch.png diff --git a/assets/deb.png b/antiquated/assets/deb.png similarity index 100% rename from assets/deb.png rename to antiquated/assets/deb.png diff --git a/assets/flatpak.png b/antiquated/assets/flatpak.png similarity index 100% rename from assets/flatpak.png rename to antiquated/assets/flatpak.png diff --git a/assets/rpm.png b/antiquated/assets/rpm.png similarity index 100% rename from assets/rpm.png rename to antiquated/assets/rpm.png diff --git a/assets/snap.png b/antiquated/assets/snap.png similarity index 100% rename from assets/snap.png rename to antiquated/assets/snap.png diff --git a/in_development/bash/osupdater.sh b/antiquated/bash/osupdater.sh similarity index 100% rename from in_development/bash/osupdater.sh rename to antiquated/bash/osupdater.sh diff --git a/in_development/python/osupdater.py b/antiquated/python/osupdater.py similarity index 100% rename from in_development/python/osupdater.py rename to antiquated/python/osupdater.py diff --git a/in_development/rust/osupdater/Cargo.toml b/in_development/rust/osupdater/Cargo.toml deleted file mode 100644 index b555fb5..0000000 --- a/in_development/rust/osupdater/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "osupdater" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -color-print = "0.3.5" diff --git a/in_development/rust/osupdater/src/main.rs b/in_development/rust/osupdater/src/main.rs deleted file mode 100644 index acb91a0..0000000 --- a/in_development/rust/osupdater/src/main.rs +++ /dev/null @@ -1,208 +0,0 @@ -use std::process::{Command, Stdio}; -use std::path::Path; -use color_print::cprintln; - -fn trim_newline(s: &mut String) { - if s.ends_with('\n') { - s.pop(); - if s.ends_with('\r') { - s.pop(); - } - } -} - -fn main() { - { - // Tell user that we are going to start the update procedure - cprintln!("osupdater : rust edition\n"); - cprintln!("This tool will locate any package managers on your system and run the update tool appropriate to it.\n"); - cprintln!("Looking for native package managers.\n"); - 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_apt = Command::new("which") - .arg("apt").stdout(Stdio::piped()).output().unwrap(); - let mut apt_bin = String::from_utf8(find_apt.stdout).unwrap(); - 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); - - //apt - cprintln!("Checking for apt"); - let path = Path::new(&apt_bin); - if path.exists(){ - let mut cmd = - Command::new(&sudo_bin) - .arg(&apt_bin).arg("update").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - let mut cmd = - Command::new(&sudo_bin) - .arg(&apt_bin).arg("upgrade").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - - // dnf - cprintln!("Checking for dnf"); - let path = Path::new(&dnf_bin); - if path.exists(){ - let mut cmd = - Command::new(&sudo_bin) - .arg(&dnf_bin).arg("--refresh").arg("--skip-broken").arg("--nobest").arg("-y").arg("update") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - - // dnf5 - cprintln!("Checking for dnf5"); - let path = Path::new(&dnf5_bin); - if path.exists(){ - let mut cmd = - Command::new(&sudo_bin) - .arg(&dnf5_bin).arg("--refresh").arg("--skip-broken").arg("--nobest").arg("-y").arg("update") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - - // pacman - cprintln!("Checking for pacman"); - let path = Path::new(&pacman_bin); - if path.exists(){ - let mut cmd = - Command::new(&sudo_bin) - .arg(&pacman_bin).arg("-Syu") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - - // urpmi - cprintln!("Checking for urpmi"); - let path = Path::new(&urpmi_bin); - if path.exists(){ - let mut cmd = - Command::new(&sudo_bin) - .arg(&urpmi_bin).arg("--auto-update").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - - // zypper - cprintln!("Checking for zypper"); - let path = Path::new(&zypper_bin); - if path.exists(){ - let mut cmd = - Command::new(&sudo_bin) - .arg(&zypper_bin).arg("in").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - - // Check container formats - cprintln!("Checking application containers"); - - - // flatpak - cprintln!("Checking for user flatpak installs"); - let path = Path::new(&flatpak_bin); - if path.exists(){ - let mut cmd = - Command::new(&flatpak_bin) - .arg("update").arg("--user").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - cprintln!("Checking for system flatpak installs"); - let path = Path::new(&flatpak_bin); - if path.exists(){ - let mut cmd = - Command::new(&sudo_bin) - .arg(&flatpak_bin).arg("update").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - - // snap - cprintln!("Checking for user snap installation"); - let path = Path::new(&snap_bin); - if path.exists(){ - let mut cmd = - Command::new(&snap_bin) - .arg("refresh").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - cprintln!("Checking for system snap installation"); - let path = Path::new(&snap_bin); - if path.exists(){ - let mut cmd = - Command::new(&sudo_bin) - .arg(&snap_bin).arg("refresh").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - - //Python - cprintln!("Updating Python user installation via pip-review"); - let path = Path::new(&pip_review_bin); - if path.exists(){ - let mut cmd = - Command::new(&pip_review_bin) - .arg("--auto").arg("--local").arg("--user") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - } -} diff --git a/in_development/rust/osupdater/src/main.rs.backup b/in_development/rust/osupdater/src/main.rs.backup deleted file mode 100644 index 4630cd7..0000000 --- a/in_development/rust/osupdater/src/main.rs.backup +++ /dev/null @@ -1,191 +0,0 @@ -use std::process::{Command, Stdio}; -use std::path::Path; -use color_print::cprintln; - -fn trim_newline(s: &mut String) { - if s.ends_with('\n') { - s.pop(); - if s.ends_with('\r') { - s.pop(); - } - } -} - -fn main() { - { - // Tell user that we are going to start the update procedure - cprintln!("osupdater : rust edition\n"); - cprintln!("This tool will locate any package managers on your system and run the update tool appropriate to it.\n"); - cprintln!("Looking for native package managers.\n"); - 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_apt = Command::new("which") - .arg("apt").stdout(Stdio::piped()).output().unwrap(); - let mut apt_bin = String::from_utf8(find_apt.stdout).unwrap(); - trim_newline(&mut apt_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); - - //apt - cprintln!("Checking for apt"); - let path = Path::new(&apt_bin); - if path.exists(){ - let mut cmd = - Command::new(&sudo_bin) - .arg(&apt_bin).arg("update").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - let mut cmd = - Command::new(&sudo_bin) - .arg(&apt_bin).arg("upgrade").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - - // dnf - cprintln!("hecking for dnf"); - let path = Path::new(&dnf_bin); - if path.exists(){ - let mut cmd = - Command::new(&sudo_bin) - .arg(&dnf_bin).arg("--refresh").arg("--skip-broken").arg("--nobest").arg("-y").arg("update") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - - // pacman - cprintln!("Checking for pacman"); - let path = Path::new(&pacman_bin); - if path.exists(){ - let mut cmd = - Command::new(&sudo_bin) - .arg(&pacman_bin).arg("-Syu") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - - // urpmi - cprintln!("Checking for urpmi"); - let path = Path::new(&urpmi_bin); - if path.exists(){ - let mut cmd = - Command::new(&sudo_bin) - .arg(&urpmi_bin).arg("--auto-update").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - - // zypper - cprintln!("Checking for zypper"); - let path = Path::new(&zypper_bin); - if path.exists(){ - let mut cmd = - Command::new(&sudo_bin) - .arg(&zypper_bin).arg("in").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - - // Check container formats - cprintln!("Checking application containers"); - - - // flatpak - cprintln!("Checking for user flatpak installs"); - let path = Path::new(&flatpak_bin); - if path.exists(){ - let mut cmd = - Command::new(&flatpak_bin) - .arg("update").arg("--user").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - cprintln!("Checking for system flatpak installs"); - let path = Path::new(&flatpak_bin); - if path.exists(){ - let mut cmd = - Command::new(&sudo_bin) - .arg(&flatpak_bin).arg("update").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - - // snap - cprintln!("Checking for user snap installation"); - let path = Path::new(&snap_bin); - if path.exists(){ - let mut cmd = - Command::new(&snap_bin) - .arg("refresh").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - cprintln!("Checking for system snap installation"); - let path = Path::new(&snap_bin); - if path.exists(){ - let mut cmd = - Command::new(&sudo_bin) - .arg(&snap_bin).arg("refresh").arg("-y") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - - //Python - cprintln!("Updating Python user installation via pip-review"); - let path = Path::new(&pip_review_bin); - if path.exists(){ - let mut cmd = - Command::new(&pip_review_bin) - .arg("--auto").arg("--local").arg("--user") - .stdout(Stdio::inherit()).stderr(Stdio::inherit()) - .spawn().unwrap(); - let _output = cmd.wait(); - } - } -} diff --git a/rust_build_osupdater.sh b/rust_build_osupdater.sh index c13b8e1..4a57b38 100755 --- a/rust_build_osupdater.sh +++ b/rust_build_osupdater.sh @@ -1,8 +1,10 @@ #!/bin/sh +echo -e "Cleaning up build environment" +rm -rf osupdater/target echo -e "Entering build directory\n" -cd in_development/rust/osupdater/ +cd osupdater/ echo -e "Building osupdater\n" cargo build -r echo -e "Copying binary to git root\n" -cp target/release/osupdater ../../../osupdater +cp target/release/osupdater ../osupdater