rustfmt
parent
5309d4347a
commit
fd6a008efb
@ -1,12 +1,12 @@
|
||||
pub mod clearcache;
|
||||
pub mod clone;
|
||||
pub mod help;
|
||||
pub mod inssort;
|
||||
pub mod install;
|
||||
pub mod search;
|
||||
pub mod strs;
|
||||
pub mod uninstall;
|
||||
pub mod upgrade;
|
||||
pub mod update;
|
||||
pub mod strs;
|
||||
pub mod upgrade;
|
||||
pub mod ver;
|
||||
pub mod inssort;
|
||||
pub mod xargs;
|
||||
|
@ -1,31 +1,30 @@
|
||||
use runas::Command;
|
||||
use crate::mods::strs::{err_unrec, succ};
|
||||
use runas::Command;
|
||||
|
||||
pub fn install(noconfirm: bool, pkg: &str) {
|
||||
let pkgs: Vec<&str> = pkg.split(" ").collect();
|
||||
if noconfirm == true {
|
||||
let result = Command::new("pacman").arg("-Sy").arg("--noconfirm").args(&pkgs).status().expect("Couldn't call pacman");
|
||||
let result = Command::new("pacman")
|
||||
.arg("-Sy")
|
||||
.arg("--noconfirm")
|
||||
.args(&pkgs)
|
||||
.status()
|
||||
.expect("Couldn't call pacman");
|
||||
match result.code() {
|
||||
Some(0) => {
|
||||
succ(format!("Succesfully installed packages: {}", pkg))
|
||||
}
|
||||
Some(_) => {
|
||||
err_unrec(format!("Couldn't install packages: {}", pkg))
|
||||
}
|
||||
None => {
|
||||
err_unrec(format!("Couldn't install packages: {}", pkg))
|
||||
}};
|
||||
Some(0) => succ(format!("Succesfully installed packages: {}", pkg)),
|
||||
Some(_) => err_unrec(format!("Couldn't install packages: {}", pkg)),
|
||||
None => err_unrec(format!("Couldn't install packages: {}", pkg)),
|
||||
};
|
||||
} else {
|
||||
let result = Command::new("pacman").arg("-Sy").args(&pkgs).status().expect("Couldn't call pacman");
|
||||
let result = Command::new("pacman")
|
||||
.arg("-Sy")
|
||||
.args(&pkgs)
|
||||
.status()
|
||||
.expect("Couldn't call pacman");
|
||||
match result.code() {
|
||||
Some(0) => {
|
||||
succ(format!("Succesfully installed packages: {}", pkg))
|
||||
}
|
||||
Some(_) => {
|
||||
err_unrec(format!("Couldn't install packages: {}", pkg))
|
||||
}
|
||||
None => {
|
||||
err_unrec(format!("Couldn't install packages: {}", pkg))
|
||||
}};
|
||||
Some(0) => succ(format!("Succesfully installed packages: {}", pkg)),
|
||||
Some(_) => err_unrec(format!("Couldn't install packages: {}", pkg)),
|
||||
None => err_unrec(format!("Couldn't install packages: {}", pkg)),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
@ -1,46 +1,51 @@
|
||||
use crate::mods::strs::{err_rec, err_unrec, sec, succ};
|
||||
use runas::Command;
|
||||
use crate::mods::strs::{err_unrec, sec, succ, err_rec};
|
||||
use std::{fs, path::Path};
|
||||
|
||||
pub fn uninstall(noconfirm: bool, pkgs: Vec<String>) {
|
||||
sec(format!("Attempting to uninstall packages: {}", &pkgs.join(" ")));
|
||||
if noconfirm == true {
|
||||
let result = Command::new("pacman").arg("-Rs").args(&pkgs).arg("--noconfirm").status().expect("Couldn't call pacman");
|
||||
match result.code() {
|
||||
Some(0) => {
|
||||
succ(format!("Succesfully uninstalled packages: {}", &pkgs.join(" ")))
|
||||
}
|
||||
Some(_) => {
|
||||
err_rec(format!("Couldn't uninstall packages: {}", &pkgs.join(" ")))
|
||||
}
|
||||
None =>{
|
||||
err_rec(format!("Couldn't uninstall packages: {}", &pkgs.join(" ")))
|
||||
}};
|
||||
} else {
|
||||
let result = Command::new("pacman").arg("-Rs").args(&pkgs).status().expect("Couldn't call pacman");
|
||||
match result.code() {
|
||||
Some(0) => {
|
||||
succ(format!("Succesfully uninstalled packages: {}", &pkgs.join(" ")))
|
||||
}
|
||||
Some(_) => {
|
||||
err_rec(format!("Couldn't uninstall packages: {}", &pkgs.join(" ")))
|
||||
}
|
||||
None =>{
|
||||
err_rec(format!("Couldn't uninstall packages: {}", &pkgs.join(" ")))
|
||||
}};
|
||||
}
|
||||
for pkg in &pkgs {
|
||||
let pkgdir = format!("{}/.cache/ame/{}", std::env::var("HOME").unwrap(), pkg);
|
||||
let path = Path::new(&pkgdir);
|
||||
if path.is_dir() {
|
||||
let rm_result = fs::remove_dir_all(&path);
|
||||
match rm_result {
|
||||
Ok(_) => {
|
||||
succ(format!("Removed AUR cache directory for {}", pkg))
|
||||
}
|
||||
Err(_) => {
|
||||
err_unrec(format!("Failed to remove AUR cache directory for {}", pkg))
|
||||
}};
|
||||
}
|
||||
sec(format!(
|
||||
"Attempting to uninstall packages: {}",
|
||||
&pkgs.join(" ")
|
||||
));
|
||||
if noconfirm == true {
|
||||
let result = Command::new("pacman")
|
||||
.arg("-Rs")
|
||||
.args(&pkgs)
|
||||
.arg("--noconfirm")
|
||||
.status()
|
||||
.expect("Couldn't call pacman");
|
||||
match result.code() {
|
||||
Some(0) => succ(format!(
|
||||
"Succesfully uninstalled packages: {}",
|
||||
&pkgs.join(" ")
|
||||
)),
|
||||
Some(_) => err_rec(format!("Couldn't uninstall packages: {}", &pkgs.join(" "))),
|
||||
None => err_rec(format!("Couldn't uninstall packages: {}", &pkgs.join(" "))),
|
||||
};
|
||||
} else {
|
||||
let result = Command::new("pacman")
|
||||
.arg("-Rs")
|
||||
.args(&pkgs)
|
||||
.status()
|
||||
.expect("Couldn't call pacman");
|
||||
match result.code() {
|
||||
Some(0) => succ(format!(
|
||||
"Succesfully uninstalled packages: {}",
|
||||
&pkgs.join(" ")
|
||||
)),
|
||||
Some(_) => err_rec(format!("Couldn't uninstall packages: {}", &pkgs.join(" "))),
|
||||
None => err_rec(format!("Couldn't uninstall packages: {}", &pkgs.join(" "))),
|
||||
};
|
||||
}
|
||||
for pkg in &pkgs {
|
||||
let pkgdir = format!("{}/.cache/ame/{}", std::env::var("HOME").unwrap(), pkg);
|
||||
let path = Path::new(&pkgdir);
|
||||
if path.is_dir() {
|
||||
let rm_result = fs::remove_dir_all(&path);
|
||||
match rm_result {
|
||||
Ok(_) => succ(format!("Removed AUR cache directory for {}", pkg)),
|
||||
Err(_) => err_unrec(format!("Failed to remove AUR cache directory for {}", pkg)),
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,21 +1,16 @@
|
||||
use runas::Command;
|
||||
use crate::mods::strs::{err_unrec, sec, succ};
|
||||
use runas::Command;
|
||||
|
||||
pub fn update() {
|
||||
sec(format!("Syncing package repos"));
|
||||
|
||||
let result = Command::new("pacman")
|
||||
.arg("-Sy")
|
||||
.status()
|
||||
.expect("Couldn't call pacman");
|
||||
.arg("-Sy")
|
||||
.status()
|
||||
.expect("Couldn't call pacman");
|
||||
match result.code() {
|
||||
Some(0) => {
|
||||
succ(format!("Repos succesfully synced"))
|
||||
}
|
||||
Some(_) => {
|
||||
err_unrec(format!("Couldn't sync package repos"))
|
||||
Some(0) => succ(format!("Repos succesfully synced")),
|
||||
Some(_) => err_unrec(format!("Couldn't sync package repos")),
|
||||
None => err_unrec(format!("Couldn't sync package repos")),
|
||||
}
|
||||
None => {
|
||||
err_unrec(format!("Couldn't sync package repos"))
|
||||
}}
|
||||
}
|
||||
|
@ -1,84 +1,75 @@
|
||||
use crate::mods::strs::{err_unrec, inf, sec, succ};
|
||||
use runas::Command;
|
||||
use std::env;
|
||||
use crate::mods::strs::{err_unrec, inf, sec, succ};
|
||||
|
||||
pub fn upgrade(noconfirm: bool){
|
||||
pub fn upgrade(noconfirm: bool) {
|
||||
let homepath = std::env::var("HOME").unwrap();
|
||||
let cachedir = format!("/{}/.cache/ame/", homepath);
|
||||
sec(format!("Performing system upgrade"));
|
||||
if noconfirm == true {
|
||||
let result = Command::new("pacman")
|
||||
.arg("-Syu")
|
||||
.arg("--noconfirm")
|
||||
.status()
|
||||
.expect("Couldn't call pacman");
|
||||
.arg("-Syu")
|
||||
.arg("--noconfirm")
|
||||
.status()
|
||||
.expect("Couldn't call pacman");
|
||||
match result.code() {
|
||||
Some(0) => {
|
||||
succ(format!("All repo packages upgraded"))
|
||||
}
|
||||
Some(_) => {
|
||||
err_unrec(format!("Couldn't upgrade packages"))
|
||||
}
|
||||
None => {
|
||||
err_unrec(format!("Couldn't upgrade packages"))
|
||||
}};
|
||||
Some(0) => succ(format!("All repo packages upgraded")),
|
||||
Some(_) => err_unrec(format!("Couldn't upgrade packages")),
|
||||
None => err_unrec(format!("Couldn't upgrade packages")),
|
||||
};
|
||||
} else {
|
||||
let result = Command::new("pacman")
|
||||
.arg("-Syu")
|
||||
.status()
|
||||
.expect("Couldn't call pacman");
|
||||
.arg("-Syu")
|
||||
.status()
|
||||
.expect("Couldn't call pacman");
|
||||
match result.code() {
|
||||
Some(0) => {
|
||||
succ(format!("All repo packages upgraded"))
|
||||
}
|
||||
Some(_) => {
|
||||
err_unrec(format!("Couldn't upgrade packages"))
|
||||
}
|
||||
None => {
|
||||
err_unrec(format!("Couldn't upgrade packages"))
|
||||
}};
|
||||
Some(0) => succ(format!("All repo packages upgraded")),
|
||||
Some(_) => err_unrec(format!("Couldn't upgrade packages")),
|
||||
None => err_unrec(format!("Couldn't upgrade packages")),
|
||||
};
|
||||
}
|
||||
|
||||
for file in std::fs::read_dir(&cachedir).unwrap() {
|
||||
let dir = &file.unwrap().path();
|
||||
let output = std::process::Command::new("git").arg("pull").output().unwrap();
|
||||
let output = std::process::Command::new("git")
|
||||
.arg("pull")
|
||||
.output()
|
||||
.unwrap();
|
||||
let update_available = String::from_utf8(output.stdout).unwrap();
|
||||
|
||||
let cd_result = env::set_current_dir(&dir);
|
||||
match cd_result {
|
||||
Ok(_) => {
|
||||
inf(format!("Entered AUR package directory to pull changes"))
|
||||
Ok(_) => inf(format!("Entered AUR package directory to pull changes")),
|
||||
Err(_) => err_unrec(format!(
|
||||
"Could not enter AUR package directory to pull changes"
|
||||
)),
|
||||
}
|
||||
Err(_) => {
|
||||
err_unrec(format!("Could not enter AUR package directory to pull changes"))
|
||||
}}
|
||||
|
||||
if update_available != "Already up to date." {
|
||||
let path_as_str = &dir.display().to_string();
|
||||
let pkg: Vec<&str> = path_as_str.split("/").collect();
|
||||
|
||||
inf(format!("{} is up to date", pkg[pkg.len()-1]));
|
||||
inf(format!("{} is up to date", pkg[pkg.len() - 1]));
|
||||
} else {
|
||||
let cd2_result = env::set_current_dir(&dir);
|
||||
match cd2_result {
|
||||
Ok(_) => {
|
||||
inf(format!("Entering AUR package directory to install new version"))
|
||||
Ok(_) => inf(format!(
|
||||
"Entering AUR package directory to install new version"
|
||||
)),
|
||||
Err(_) => err_unrec(format!(
|
||||
"Couldn't enter AUR package directory to install new version"
|
||||
)),
|
||||
}
|
||||
Err(_) => {
|
||||
err_unrec(format!("Couldn't enter AUR package directory to install new version"))
|
||||
}}
|
||||
|
||||
let makepkg_result = std::process::Command::new("makepkg").arg("-si").status().expect("Couldn't call makepkg");
|
||||
let makepkg_result = std::process::Command::new("makepkg")
|
||||
.arg("-si")
|
||||
.status()
|
||||
.expect("Couldn't call makepkg");
|
||||
match makepkg_result.code() {
|
||||
Some(0) => {
|
||||
succ(format!("New AUR package version installed"))
|
||||
}
|
||||
Some(_) => {
|
||||
err_unrec(format!("Couldn't install new AUR package version"))
|
||||
}
|
||||
None => {
|
||||
err_unrec(format!("Couldn't install new AUR package version"))
|
||||
}};
|
||||
Some(0) => succ(format!("New AUR package version installed")),
|
||||
Some(_) => err_unrec(format!("Couldn't install new AUR package version")),
|
||||
None => err_unrec(format!("Couldn't install new AUR package version")),
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,17 +1,17 @@
|
||||
pub fn noconf(args: &Vec<String>) -> bool {
|
||||
if args.contains(&"--noconfirm".to_string()) || args[1].ends_with(&"n".to_string()) {
|
||||
true
|
||||
} else {
|
||||
false
|
||||
}
|
||||
if args.contains(&"--noconfirm".to_string()) || args[1].ends_with(&"n".to_string()) {
|
||||
true
|
||||
} else {
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
pub fn argssort(args: &mut Vec<String>) -> &Vec<String> {
|
||||
if args.contains(&"--noconfirm".to_string()) {
|
||||
args.retain(|x| x != &"--noconfirm".to_string());
|
||||
println!("{:?}", args);
|
||||
args
|
||||
} else {
|
||||
args
|
||||
}
|
||||
if args.contains(&"--noconfirm".to_string()) {
|
||||
args.retain(|x| x != &"--noconfirm".to_string());
|
||||
println!("{:?}", args);
|
||||
args
|
||||
} else {
|
||||
args
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue