From c3b0fd7a2d988ad6ff623fed6ecaef9a779a34e8 Mon Sep 17 00:00:00 2001 From: Michal S Date: Fri, 19 Aug 2022 20:48:34 +0100 Subject: [PATCH] Changed location of detect and added prompt to upgrade --- src/main.rs | 4 ---- src/operations/upgrade.rs | 12 ++++++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main.rs b/src/main.rs index dda3fb1..670b3e0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -7,7 +7,6 @@ use internal::commands::ShellCommand; use internal::error::SilentUnwrap; use crate::args::{InstallArgs, Operation, QueryArgs, RemoveArgs, SearchArgs}; -use crate::internal::detect; use crate::internal::exit_code::AppExitCode; use crate::internal::{init, sort, start_sudoloop, structs::Options}; @@ -61,9 +60,6 @@ fn main() { operations::clean(options); } } - - // Check for .pacnew files - detect(); } fn cmd_install(args: InstallArgs, options: Options) { diff --git a/src/operations/upgrade.rs b/src/operations/upgrade.rs index 472c3e1..32c20d7 100644 --- a/src/operations/upgrade.rs +++ b/src/operations/upgrade.rs @@ -2,6 +2,7 @@ use crate::internal::commands::ShellCommand; use crate::internal::error::SilentUnwrap; use crate::internal::exit_code::AppExitCode; use crate::internal::rpc::rpcinfo; +use crate::internal::detect; use crate::operations::aur_install::aur_install; use crate::{info, log, prompt, Options}; @@ -100,10 +101,17 @@ pub fn upgrade(options: Options) { } } - // If vector isn't empty, 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() { - aur_install(aur_upgrades, options); + let cont = prompt!(default false, + "Found AUR packages {} have new versions available, upgrade?", + aur_upgrades.join(", "), + ); + if cont { aur_install(aur_upgrades, options); }; } else { info!("No upgrades available for installed AUR packages"); } + + // Check for .pacnew files + detect(); }