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