diff --git a/src/internal/structs.rs b/src/internal/structs.rs index 39b3729..7fd8007 100644 --- a/src/internal/structs.rs +++ b/src/internal/structs.rs @@ -20,5 +20,4 @@ pub struct Options { pub verbosity: i32, pub noconfirm: bool, pub asdeps: bool, - pub skippgp: bool, } diff --git a/src/main.rs b/src/main.rs index 86f7f6e..10870db 100644 --- a/src/main.rs +++ b/src/main.rs @@ -39,12 +39,6 @@ fn main() { .set(ArgSettings::Global) .help("Complete operation without prompting user"), ) - .arg( - Arg::with_name("skippgp") - .long("skippgp") - .set(ArgSettings::Global) - .help("Ignore checking PGP signatures in PKGBUILDs"), - ) .subcommand( SubCommand::with_name("install") .about( @@ -139,13 +133,11 @@ fn main() { let verbosity: i32 = matches.occurrences_of("verbose") as i32; let noconfirm: bool = matches.is_present("noconfirm"); - let skippgp: bool = matches.is_present("skippgp"); let options = Options { verbosity, noconfirm, asdeps: false, - skippgp, }; init(options); diff --git a/src/operations/aur_install.rs b/src/operations/aur_install.rs index 86d4de2..2f9f304 100644 --- a/src/operations/aur_install.rs +++ b/src/operations/aur_install.rs @@ -13,7 +13,6 @@ pub fn aur_install(a: Vec, options: Options) { let cachedir = format!("{}/.cache/ame/", env::var("HOME").unwrap()); let verbosity = options.verbosity; let noconfirm = options.noconfirm; - let skippgp = options.skippgp; if verbosity >= 1 { log(format!("Installing from AUR: {:?}", &a)); @@ -83,7 +82,6 @@ pub fn aur_install(a: Vec, options: Options) { verbosity, noconfirm, asdeps: true, - skippgp, }; if !sorted.nf.is_empty() || !md_sorted.nf.is_empty() { @@ -130,16 +128,13 @@ pub fn aur_install(a: Vec, options: Options) { crate::operations::aur_install(md_sorted.aur, newopts); } - let mut makepkg_args = vec!["-rsic", "--needed"]; + let mut makepkg_args = vec!["-rsic", "--needed", "--skippgp"]; if options.asdeps { makepkg_args.push("--asdeps") } if options.noconfirm { makepkg_args.push("--noconfirm") } - if options.skippgp { - makepkg_args.push("--skippgp") - } // package building and installing info("Building time!".to_string());