crystal-linux-mirror
/
amethyst
mirror of https://git.getcryst.al/crystal/software/amethyst.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split Upgrade into AUR/repo

Browse Source
i18n
Michal S 2 years ago
parent 2b7b4aa878
commit c4ecfc2d78
No known key found for this signature in database
GPG Key ID: A6A1A4DCB22279B9
4 changed files with 126 additions and 105 deletions
Show Stats Download Patch File Download Diff File

21
src/args.rs
Unescape Escape View File

@ -15,7 +15,7 @@ pub struct Args {
pub no_confirm: bool,
/// Loops sudo in the background to ensure it doesn't time out during long builds
#[clap(long = "sudoloop")]
#[clap(long = "sudoloop", global = true)]
pub sudoloop: bool,
}
@ -39,16 +39,20 @@ pub enum Operation {
/// Upgrades locally installed packages to their latest versions
#[clap(name = "upgrade", aliases = & ["upg", "up", "u", "-Syu"])]
Upgrade,
Upgrade(UpgradeArgs),
/// Removes all orphaned packages
#[clap(name = "clean", aliases = & ["cln", "cl", "-Sc"])]
Clean,
/// Runs pacdiff
#[clap(name = "diff", aliases = & ["dif", "di", "-d"])]
Diff,
}
impl Default for Operation {
fn default() -> Self {
Self::Upgrade
Self::Upgrade(UpgradeArgs::default())
}
}
@ -97,3 +101,14 @@ pub struct QueryArgs {
#[clap(long, short, from_global)]
pub repo: bool,
}
#[derive(Default, Debug, Clone, Parser)]
pub struct UpgradeArgs {
/// Upgrades only repo/native packages
#[clap(long, short)]
pub repo: bool,
/// Upgrades only from the AUR
#[clap(long, short)]
pub aur: bool,
}

14
src/internal/initialise.rs
Unescape Escape View File

@ -8,20 +8,6 @@ pub fn init(options: Options) {
let verbosity = options.verbosity;
let homedir = env::var("HOME").unwrap();
// Initialise stateful directory
if !Path::new(&format!("{}/.local/share/ame", homedir)).exists() {
if verbosity >= 1 {
log!("Initialising stateful directory");
}
std::fs::create_dir_all(format!("{}/.local/share/ame", homedir)).unwrap_or_else(|e| {
crash!(
AppExitCode::FailedCreatingPaths,
"Failed to create stateful directory: {}",
e
);
});
}
// If cache path doesn't exist, create it, if it does, delete it and recreate it
if !Path::new(&format!("{}/.cache/ame/", homedir)).exists() {
if verbosity >= 1 {

18
src/main.rs
Unescape Escape View File

@ -6,9 +6,9 @@ use clap::Parser;
use internal::commands::ShellCommand;
use internal::error::SilentUnwrap;
use crate::args::{InstallArgs, Operation, QueryArgs, RemoveArgs, SearchArgs};
use crate::args::{InstallArgs, Operation, QueryArgs, RemoveArgs, SearchArgs, UpgradeArgs};
use crate::internal::exit_code::AppExitCode;
use crate::internal::{init, sort, start_sudoloop, structs::Options};
use crate::internal::{init, sort, start_sudoloop, structs::Options, detect};
#[global_allocator]
static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
@ -51,14 +51,15 @@ fn main() {
Operation::Remove(remove_args) => cmd_remove(remove_args, options),
Operation::Search(search_args) => cmd_search(search_args, options),
Operation::Query(query_args) => cmd_query(query_args),
Operation::Upgrade => {
info!("Performing system upgrade");
operations::upgrade(options);
}
Operation::Upgrade(upgrade_args) => cmd_upgrade(upgrade_args, options),
Operation::Clean => {
info!("Removing orphaned packages");
operations::clean(options);
}
Operation::Diff => {
info!("Running pacdiff");
detect();
}
}
}
@ -150,3 +151,8 @@ fn cmd_query(args: QueryArgs) {
.silent_unwrap(AppExitCode::PacmanError);
}
}
fn cmd_upgrade(args: UpgradeArgs, options: Options) {
info!("Performing system upgrade");
operations::upgrade(options, args);
}

178
src/operations/upgrade.rs
Unescape Escape View File

@ -3,6 +3,7 @@ use crate::internal::detect;
use crate::internal::error::SilentUnwrap;
use crate::internal::exit_code::AppExitCode;
use crate::internal::rpc::rpcinfo;
use crate::args::UpgradeArgs;
use crate::operations::aur_install::aur_install;
use crate::{info, log, prompt, Options, spinner};
@ -12,111 +13,124 @@ struct QueriedPackage {
pub version: String,
}
pub fn upgrade(options: Options) {
pub fn upgrade(options: Options, args: UpgradeArgs) {
// Initialise variables
let verbosity = options.verbosity;
let noconfirm = options.noconfirm;
// Build pacman args
let mut pacman_args = vec!["-Syu"];
if noconfirm {
pacman_args.push("--noconfirm");
}
if verbosity >= 1 {
log!("Upgrading repo packages");
}
let args = if !args.aur && !args.repo {
UpgradeArgs {
aur: true,
repo: true,
}
} else {
args
};
if args.repo {
// Build pacman args
let mut pacman_args = vec!["-Syu"];
if noconfirm {
pacman_args.push("--noconfirm");
}
// Upgrade repo packages
let pacman_result = ShellCommand::pacman()
.elevated()
.args(pacman_args)
.wait()
.silent_unwrap(AppExitCode::PacmanError);
if verbosity >= 1 {
log!("Upgrading repo packages");
}
if pacman_result.success() {
// If pacman was successful, notify user
info!("Successfully upgraded repo packages");
} else {
// Otherwise, prompt user whether to continue
let cont = prompt!(default false,
// Upgrade repo packages
let pacman_result = ShellCommand::pacman()
.elevated()
.args(pacman_args)
.wait()
.silent_unwrap(AppExitCode::PacmanError);
if pacman_result.success() {
// If pacman was successful, notify user
info!("Successfully upgraded repo packages");
} else {
// Otherwise, prompt user whether to continue
let cont = prompt!(default false,
"Failed to upgrade repo packages, continue to upgrading AUR packages?",
);
if !cont {
// If user doesn't want to continue, break
info!("Exiting");
std::process::exit(AppExitCode::PacmanError as i32);
if !cont {
// If user doesn't want to continue, break
info!("Exiting");
std::process::exit(AppExitCode::PacmanError as i32);
}
}
}
if verbosity >= 1 {
log!("Checking AUR upgrades...");
}
// Start spinner
let sp = spinner!("Checking AUR upgrades...");
// List non-native packages using `pacman -Qm` and collect to a Vec<String>
let non_native = ShellCommand::pacman()
.arg("-Qm")
.args(&["--color", "never"])
.wait_with_output()
.silent_unwrap(AppExitCode::PacmanError);
// Collect by lines to a Vec<String>
let mut non_native = non_native.stdout.split('\n').collect::<Vec<&str>>();
// Remove last element, which is an empty line
non_native.pop();
// Parse non-native packages into a Vec<QueriedPackage>
let mut parsed_non_native: Vec<QueriedPackage> = vec![];
for pkg in non_native {
// Split by space
let split = pkg.split(' ').collect::<Vec<&str>>();
if args.aur {
if verbosity >= 1 {
log!("{:?}", split);
log!("Checking AUR upgrades...");
}
// Create QueriedPackage and push it to parsed_non_native
let name = split[0].to_string();
let version = split[1].to_string();
parsed_non_native.push(QueriedPackage { name, version });
}
if verbosity >= 1 {
log!("{:?}", &parsed_non_native);
}
// Check if AUR package versions are the same as installed
let mut aur_upgrades = vec![];
for pkg in parsed_non_native {
// Query AUR
let rpc_result = rpcinfo((&*pkg.name).to_string());
// Start spinner
let sp = spinner!("Checking AUR upgrades...");
// List non-native packages using `pacman -Qm` and collect to a Vec<String>
let non_native = ShellCommand::pacman()
.arg("-Qm")
.args(&["--color", "never"])
.wait_with_output()
.silent_unwrap(AppExitCode::PacmanError);
// Collect by lines to a Vec<String>
let mut non_native = non_native.stdout.split('\n').collect::<Vec<&str>>();
// Remove last element, which is an empty line
non_native.pop();
// Parse non-native packages into a Vec<QueriedPackage>
let mut parsed_non_native: Vec<QueriedPackage> = vec![];
for pkg in non_native {
// Split by space
let split = pkg.split(' ').collect::<Vec<&str>>();
if verbosity >= 1 {
log!("{:?}", split);
}
// Create QueriedPackage and push it to parsed_non_native
let name = split[0].to_string();
let version = split[1].to_string();
parsed_non_native.push(QueriedPackage { name, version });
}
if !rpc_result.found {
// If package not found, skip
continue;
if verbosity >= 1 {
log!("{:?}", &parsed_non_native);
}
// If versions differ, push to a vector
if rpc_result.package.unwrap().version != pkg.version {
aur_upgrades.push(pkg.name);
// Check if AUR package versions are the same as installed
let mut aur_upgrades = vec![];
for pkg in parsed_non_native {
// Query AUR
let rpc_result = rpcinfo((&*pkg.name).to_string());
if !rpc_result.found {
// If package not found, skip
continue;
}
// If versions differ, push to a vector
if rpc_result.package.unwrap().version != pkg.version {
aur_upgrades.push(pkg.name);
}
}
}
sp.stop_bold("Finished!");
sp.stop_bold("Finished!");
// If vector isn't empty, prompt to install AUR packages from vector, effectively upgrading
if !aur_upgrades.is_empty() {
let cont = prompt!(default false,
// If vector isn't empty, prompt to install AUR packages from vector, effectively upgrading
if !aur_upgrades.is_empty() {
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");
if cont {
aur_install(aur_upgrades, options);
};
} else {
info!("No upgrades available for installed AUR packages");
}
}
// Check for .pacnew files

Write Preview
Loading…
Cancel
Save