From ece5b9172db01ece4c7b8fd9b20ccfcfad01f3ef Mon Sep 17 00:00:00 2001 From: Rafael Madriz <3alouchi2006@gmail.com> Date: Fri, 10 Sep 2021 17:48:59 +0200 Subject: [PATCH] removed snap support --- ame.toml | 1 - src/main.rs | 21 +-------------------- src/mods.rs | 1 - src/mods/config.rs | 5 +---- src/mods/snap.rs | 6 ------ 5 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 src/mods/snap.rs diff --git a/ame.toml b/ame.toml index b57a60e..439eef5 100644 --- a/ame.toml +++ b/ame.toml @@ -3,7 +3,6 @@ cache = "/home/ali/.ame" [backends] pacman = true flatpak = false -snap = false aur = true [pacman] diff --git a/src/main.rs b/src/main.rs index f8e4de3..bacaac9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,7 @@ mod mods; use toml; use serde; -use mods::{clearcache::clearcache, clone::clone, help::help, install::install, search::{a_search, r_search}, uninstall::uninstall, upgrade::upgrade, flatpak::flatpak, snap::snap, config::printconfig}; +use mods::{clearcache::clearcache, clone::clone, help::help, install::install, search::{a_search, r_search}, uninstall::uninstall, upgrade::upgrade, flatpak::flatpak, config::printconfig}; use std::{fs, fs::File, io::prelude::*, env, process::exit, process::Command}; #[derive(serde::Deserialize)] @@ -15,7 +15,6 @@ struct General { struct Backends { pacman: Option, flatpak: Option, - snap: Option, aur: Option, } @@ -34,7 +33,6 @@ fn main() { [backends] pacman = true flatpak = true - snap = false aur = true [pacman] @@ -117,23 +115,6 @@ fn main() { println!("Enable flatpak support in your configuration and try again!"); exit(1); } - } else if oper == "-s" || oper=="snap" { - if configfile.backends.snap.unwrap() == true { - let b = std::path::Path::new("/usr/bin/snap").exists(); - if b == true { - for arg in env::args().skip(2) { - snap(&arg); - } - } else { - println!("ERROR: snap not found, please install snap and try again!"); - println!("If you do have snap installed, please open an issue on the ame github repo!"); - exit(1); - } - } else { - println!("ERROR: snap support is disabled in your ame config!"); - println!("Enable snap support in your configuration and try again!"); - exit(1); - } } else if oper == "-Pc" || oper=="pricon" || oper=="printconf" { printconfig(); } else { diff --git a/src/mods.rs b/src/mods.rs index aade6d0..2a86b45 100644 --- a/src/mods.rs +++ b/src/mods.rs @@ -6,5 +6,4 @@ pub mod search; pub mod uninstall; pub mod upgrade; pub mod flatpak; -pub mod snap; pub mod config; \ No newline at end of file diff --git a/src/mods/config.rs b/src/mods/config.rs index f35d49b..ff50d75 100644 --- a/src/mods/config.rs +++ b/src/mods/config.rs @@ -14,7 +14,6 @@ struct General { struct Backends { pacman: Option, flatpak: Option, - snap: Option, aur: Option, } @@ -34,7 +33,6 @@ pub fn printconfig() { [backends] pacman = true flatpak = true - snap = false aur = true [pacman] @@ -53,9 +51,8 @@ Backends: pacman support: {} aur support: {} flatpak support: {} - snap support: {} Pacman: noconfirm: {} -", configfile.cache.unwrap(), configfile.backends.pacman.unwrap(), configfile.backends.aur.unwrap(), configfile.backends.flatpak.unwrap(), configfile.backends.snap.unwrap(), configfile.pacman.noconfirm.unwrap()); +", configfile.cache.unwrap(), configfile.backends.pacman.unwrap(), configfile.backends.aur.unwrap(), configfile.backends.flatpak.unwrap(), configfile.pacman.noconfirm.unwrap()); } \ No newline at end of file diff --git a/src/mods/snap.rs b/src/mods/snap.rs deleted file mode 100644 index bf6b407..0000000 --- a/src/mods/snap.rs +++ /dev/null @@ -1,6 +0,0 @@ -use runas::Command; - -pub fn snap(pkg: &str) { - let errstr = format!("Oops.. Something went wrong!"); - Command::new("snap").arg("install").arg(&pkg).status().expect(&errstr); -} \ No newline at end of file