Michal S 2 years ago
parent 527c3867c6
commit d76a4702d0
No known key found for this signature in database
GPG Key ID: A6A1A4DCB22279B9

@ -1,8 +1,9 @@
use std::env;
use crate::internal::commands::ShellCommand; use crate::internal::commands::ShellCommand;
use crate::internal::error::SilentUnwrap; use crate::internal::error::SilentUnwrap;
use crate::internal::exit_code::AppExitCode; use crate::internal::exit_code::AppExitCode;
use crate::{prompt, warn, spinner}; use crate::{prompt, spinner, warn};
use std::env;
pub fn detect() { pub fn detect() {
// Start spinner // Start spinner

@ -176,10 +176,8 @@ pub fn spinner_fn(text: String) -> Spinner {
Spinner { Spinner {
spinner: spinoff::Spinner::new( spinner: spinoff::Spinner::new(
spinoff::Spinners::Line, spinoff::Spinners::Line,
format!("{}", format!("{}", text.bold()),
text.bold()),
spinoff::Color::Magenta, spinoff::Color::Magenta,
) ),
} }
} }

@ -6,9 +6,11 @@ use clap::Parser;
use internal::commands::ShellCommand; use internal::commands::ShellCommand;
use internal::error::SilentUnwrap; use internal::error::SilentUnwrap;
use crate::args::{InstallArgs, Operation, QueryArgs, RemoveArgs, SearchArgs, UpgradeArgs, InfoArgs}; use crate::args::{
InfoArgs, InstallArgs, Operation, QueryArgs, RemoveArgs, SearchArgs, UpgradeArgs,
};
use crate::internal::exit_code::AppExitCode; use crate::internal::exit_code::AppExitCode;
use crate::internal::{init, sort, start_sudoloop, structs::Options, detect}; use crate::internal::{detect, init, sort, start_sudoloop, structs::Options};
#[global_allocator] #[global_allocator]
static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
@ -102,7 +104,11 @@ fn cmd_install(args: InstallArgs, options: Options) {
} }
for a in sorted.aur { for a in sorted.aur {
info!("{}:", a); info!("{}:", a);
let dir_bytes = std::process::Command::new("mktemp").arg("-d").output().unwrap().stdout; let dir_bytes = std::process::Command::new("mktemp")
.arg("-d")
.output()
.unwrap()
.stdout;
let dir = String::from_utf8(dir_bytes).unwrap(); let dir = String::from_utf8(dir_bytes).unwrap();
std::process::Command::new("bash") std::process::Command::new("bash")
.arg("-c") .arg("-c")

@ -8,7 +8,7 @@ use crate::internal::commands::ShellCommand;
use crate::internal::error::SilentUnwrap; use crate::internal::error::SilentUnwrap;
use crate::internal::exit_code::AppExitCode; use crate::internal::exit_code::AppExitCode;
use crate::internal::rpc::rpcinfo; use crate::internal::rpc::rpcinfo;
use crate::{crash, info, log, warn, prompt, Options}; use crate::{crash, info, log, prompt, warn, Options};
pub fn aur_install(a: Vec<String>, options: Options) { pub fn aur_install(a: Vec<String>, options: Options) {
// Initialise variables // Initialise variables
@ -97,7 +97,8 @@ pub fn aur_install(a: Vec<String>, options: Options) {
.stdout .stdout
.split_whitespace() .split_whitespace()
.collect::<Vec<&str>>() .collect::<Vec<&str>>()
.iter().map(|s| s.to_string()) .iter()
.map(|s| s.to_string())
.collect::<Vec<String>>(); .collect::<Vec<String>>();
// Remove installed packages from sorted dependencies and makedepends // Remove installed packages from sorted dependencies and makedepends
@ -213,9 +214,6 @@ pub fn aur_install(a: Vec<String>, options: Options) {
// If any packages failed to build, warn user with failed packages // If any packages failed to build, warn user with failed packages
if !failed.is_empty() { if !failed.is_empty() {
warn!( warn!("Failed to build packages {}", failed.join(", "));
"Failed to build packages {}",
failed.join(", ")
);
} }
} }

@ -1,11 +1,11 @@
use crate::args::UpgradeArgs;
use crate::internal::commands::ShellCommand; use crate::internal::commands::ShellCommand;
use crate::internal::detect; use crate::internal::detect;
use crate::internal::error::SilentUnwrap; use crate::internal::error::SilentUnwrap;
use crate::internal::exit_code::AppExitCode; use crate::internal::exit_code::AppExitCode;
use crate::internal::rpc::rpcinfo; use crate::internal::rpc::rpcinfo;
use crate::args::UpgradeArgs;
use crate::operations::aur_install::aur_install; use crate::operations::aur_install::aur_install;
use crate::{info, log, prompt, warn, Options, spinner}; use crate::{info, log, prompt, spinner, warn, Options};
#[derive(Debug)] #[derive(Debug)]
struct QueriedPackage { struct QueriedPackage {
@ -50,9 +50,7 @@ pub fn upgrade(options: Options, args: UpgradeArgs) {
info!("Successfully upgraded repo packages"); info!("Successfully upgraded repo packages");
} else { } else {
// Otherwise warn user // Otherwise warn user
warn!( warn!("Failed to upgrade repo packages.",);
"Failed to upgrade repo packages.",
);
} }
} }
@ -126,9 +124,9 @@ pub fn upgrade(options: Options, args: UpgradeArgs) {
// If vector isn't empty, prompt to install AUR packages from vector, effectively upgrading // If vector isn't empty, prompt to install AUR packages from vector, effectively upgrading
if !aur_upgrades.is_empty() { if !aur_upgrades.is_empty() {
let cont = prompt!(default true, let cont = prompt!(default true,
"Found AUR packages {} have new versions available, upgrade?", "Found AUR packages {} have new versions available, upgrade?",
aur_upgrades.join(", "), aur_upgrades.join(", "),
); );
if cont { if cont {
aur_install(aur_upgrades, options); aur_install(aur_upgrades, options);
}; };

Loading…
Cancel
Save