Globalised `-v` and `--noconfirm`, made `--noconfirm` apply to clean properly. Fmt + import optimise.

i18n
Michal 2 years ago
parent 4dbaa93d45
commit c6f472cb90

@ -7,38 +7,38 @@ pub struct Args {
pub subcommand: Option<Operation>, pub subcommand: Option<Operation>,
/// Sets the level of verbosity /// Sets the level of verbosity
#[clap(long, short, parse(from_occurrences))] #[clap(long, short, parse(from_occurrences), global = true)]
pub verbose: usize, pub verbose: usize,
/// Complete operation without prompting user /// Complete operation without prompting user
#[clap(long = "noconfirm")] #[clap(long = "noconfirm", global = true)]
pub no_confirm: bool, pub no_confirm: bool,
} }
#[derive(Debug, Clone, Subcommand)] #[derive(Debug, Clone, Subcommand)]
pub enum Operation { pub enum Operation {
/// Installs a package from either the AUR or the PacMan-defined repositories /// Installs a package from either the AUR or the PacMan-defined repositories
#[clap(name = "install", aliases = &["ins", "in", "i", "-S"])] #[clap(name = "install", aliases = & ["ins", "in", "i", "-S"])]
Install(InstallArgs), Install(InstallArgs),
/// Removes a previously installed package /// Removes a previously installed package
#[clap(name = "remove", aliases = &["rm", "r", "-R", "-Rs"])] #[clap(name = "remove", aliases = & ["rm", "r", "-R", "-Rs"])]
Remove(RemoveArgs), Remove(RemoveArgs),
/// Searches for the relevant packages in both the AUR and repos /// Searches for the relevant packages in both the AUR and repos
#[clap(name = "search", aliases = &["sea", "sear", "se", "s", "-Ss"])] #[clap(name = "search", aliases = & ["sea", "sear", "se", "s", "-Ss"])]
Search(SearchArgs), Search(SearchArgs),
/// Queries installed packages /// Queries installed packages
#[clap(name = "query", aliases = &["q", "qu", "l", "ls", "-Q"])] #[clap(name = "query", aliases = & ["q", "qu", "l", "ls", "-Q"])]
Query(QueryArgs), Query(QueryArgs),
/// Upgrades locally installed packages to their latest versions /// Upgrades locally installed packages to their latest versions
#[clap(name = "upgrade", aliases = &["upg", "up", "u", "-Syu"])] #[clap(name = "upgrade", aliases = & ["upg", "up", "u", "-Syu"])]
Upgrade, Upgrade,
/// Removes all orphaned packages /// Removes all orphaned packages
#[clap(name = "clean", aliases = &["cln", "cl", "-Sc"])] #[clap(name = "clean", aliases = & ["cln", "cl", "-Sc"])]
Clean, Clean,
} }

@ -63,7 +63,11 @@ pub fn clean(options: Options) {
} }
} }
let clear_cache = prompt("Also clear pacman's package cache?".to_string(), false); let clear_cache = if !noconfirm {
prompt("Also clear pacman's package cache?".to_string(), false)
} else {
true
};
if clear_cache { if clear_cache {
let mut pacman_args = vec!["-Sc"]; let mut pacman_args = vec!["-Sc"];
if noconfirm { if noconfirm {

Loading…
Cancel
Save