Merge remote-tracking branch 'origin-crystal/development'
Signed-off-by: trivernis <trivernis@protonmail.com>i18n
commit
f763a7aaaf
GPG Key ID:
DFFFCC2C7A02DB45
@ -1,27 +1,37 @@
|
||||
# Maintainer: Matt C <mdc028[at]bucknell[dot]edu>
|
||||
# Developer: axtlos <axtlos[at]salyut[dot]one>
|
||||
# Developer: jnats <jnats[at]salyut[dot]one>
|
||||
# Maintainer: Matt C <matt[at]tar[dot]black>
|
||||
# Developer: axtlos <axtlos[at]tar[dot]black>
|
||||
# Developer: Michal S <michal[at]tar[dot]black>
|
||||
|
||||
pkgname=amethyst
|
||||
pkgver=3.2.0
|
||||
pkgver=3.3.0
|
||||
pkgrel=1
|
||||
pkgdesc="Fast, efficient and lightweight AUR helper/pacman wrapper"
|
||||
arch=('any')
|
||||
url="https://git.tar.black/crystal/ame"
|
||||
pkgdesc="A fast and efficient AUR helper"
|
||||
arch=('x86_64')
|
||||
url="https://github.com/crystal-linux/amethyst"
|
||||
license=('GPL3')
|
||||
source=("git+https://git.tar.black/crystal/ame")
|
||||
source=("git+$url")
|
||||
sha256sums=('SKIP')
|
||||
depends=('git' 'binutils' 'fakeroot')
|
||||
makedepends=('cargo' 'make')
|
||||
depends=('git' 'binutils' 'fakeroot' 'pacman-contrib')
|
||||
makedepends=('cargo')
|
||||
conflicts=('ame')
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/$pkgname"
|
||||
cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
|
||||
}
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/ame
|
||||
cargo build --release --all-features
|
||||
cd "$srcdir/$pkgname"
|
||||
export RUSTUP_TOOLCHAIN=stable
|
||||
export CARGO_TARGET_DIR=target
|
||||
cargo build --frozen --release --all-features
|
||||
}
|
||||
|
||||
package() {
|
||||
mkdir -p $pkgdir/usr/bin
|
||||
chmod +x ${srcdir}/ame/target/release/{ame,apt,apt-get,dnf,eopkg,yum,zypper}
|
||||
cp ${srcdir}/ame/target/release/{ame,apt,apt-get,dnf,eopkg,yum,zypper} $pkgdir/usr/bin/.
|
||||
cd "$srcdir/$pkgname"
|
||||
find target/release \
|
||||
-maxdepth 1 \
|
||||
-executable \
|
||||
-type f \
|
||||
-exec install -Dm0755 -t "${pkgdir}/usr/bin/" {} +
|
||||
}
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
use crate::internal::commands::ShellCommand;
|
||||
use crate::internal::error::SilentUnwrap;
|
||||
use crate::internal::exit_code::AppExitCode;
|
||||
use crate::{prompt, warn};
|
||||
|
||||
pub fn detect() {
|
||||
let mut pacnew = vec![];
|
||||
|
||||
for entry in std::fs::read_dir("/etc").unwrap() {
|
||||
let entry = entry.unwrap();
|
||||
let path = entry.path();
|
||||
if path.to_str().unwrap().contains(".pacnew") || path.to_str().unwrap().contains(".pacsave")
|
||||
{
|
||||
pacnew.push(path);
|
||||
}
|
||||
}
|
||||
|
||||
if !pacnew.is_empty() {
|
||||
let choice = prompt!(default false, "It appears that at least one program you have installed / upgraded has installed a .pacnew/.pacsave config file. Would you like to run pacdiff to deal with this? You can always deal with this later by running `sudo pacdiff`");
|
||||
if choice {
|
||||
warn!("Unless you've set an alternative using the DIFFPROG environment variable, pacdiff uses `vimdiff` by default to edit files for merging. Make sure you know how to exit vim before proceeding");
|
||||
let cont = prompt!(default false, "Continue?");
|
||||
if cont {
|
||||
ShellCommand::pacdiff()
|
||||
.elevated()
|
||||
.wait()
|
||||
.silent_unwrap(AppExitCode::PacmanError);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,113 @@
|
||||
use std::process::Command;
|
||||
|
||||
use crate::crash;
|
||||
use crate::info;
|
||||
use crate::internal::commands::ShellCommand;
|
||||
use crate::internal::error::SilentUnwrap;
|
||||
use crate::internal::exit_code::AppExitCode;
|
||||
use crate::log;
|
||||
use crate::prompt;
|
||||
use crate::Options;
|
||||
|
||||
pub fn clean(options: Options) {
|
||||
let verbosity = options.verbosity;
|
||||
let noconfirm = options.noconfirm;
|
||||
|
||||
let orphaned_packages = ShellCommand::pacman()
|
||||
.arg("-Qdtq")
|
||||
.wait_with_output()
|
||||
.silent_unwrap(AppExitCode::PacmanError);
|
||||
|
||||
if orphaned_packages.stdout.as_str() == "" {
|
||||
info!("No orphaned packages found");
|
||||
} else {
|
||||
info!(
|
||||
"Removing orphans would uninstall the following packages: \n{}",
|
||||
&orphaned_packages.stdout
|
||||
);
|
||||
let cont = prompt!(default false, "Continue?");
|
||||
if !cont {
|
||||
info!("Exiting");
|
||||
std::process::exit(AppExitCode::PacmanError as i32);
|
||||
}
|
||||
|
||||
let mut pacman_args = vec!["-Rns"];
|
||||
if noconfirm {
|
||||
pacman_args.push("--noconfirm");
|
||||
}
|
||||
|
||||
let orphaned_packages_vec = orphaned_packages.stdout.split('\n').collect::<Vec<&str>>();
|
||||
for package in &orphaned_packages_vec {
|
||||
if !package.is_empty() {
|
||||
pacman_args.push(package);
|
||||
}
|
||||
}
|
||||
|
||||
if verbosity >= 1 {
|
||||
log!("Removing orphans: {:?}", orphaned_packages_vec);
|
||||
}
|
||||
|
||||
let pacman_result = ShellCommand::pacman()
|
||||
.elevated()
|
||||
.args(pacman_args)
|
||||
.wait()
|
||||
.silent_unwrap(AppExitCode::PacmanError);
|
||||
|
||||
if pacman_result.success() {
|
||||
info!("Successfully removed orphans");
|
||||
} else {
|
||||
crash!(AppExitCode::PacmanError, "Failed to remove orphans",);
|
||||
}
|
||||
}
|
||||
|
||||
let clear_cache = if !noconfirm {
|
||||
prompt!(default false, "Also clear pacman's package cache?")
|
||||
} else {
|
||||
true
|
||||
};
|
||||
if clear_cache {
|
||||
let mut pacman_args = vec!["-Sc"];
|
||||
if noconfirm {
|
||||
pacman_args.push("--noconfirm");
|
||||
}
|
||||
|
||||
let mut paccache_args = vec!["-r"];
|
||||
if noconfirm {
|
||||
paccache_args.push("--noconfirm");
|
||||
}
|
||||
|
||||
if verbosity >= 1 {
|
||||
log!("Clearing using `paccache -r`");
|
||||
}
|
||||
|
||||
Command::new("sudo")
|
||||
.arg("paccache")
|
||||
.args(paccache_args)
|
||||
.spawn()
|
||||
.unwrap_or_else(|e| {
|
||||
crash!(
|
||||
AppExitCode::PacmanError,
|
||||
"Couldn't clear cache using `paccache -r`, {}",
|
||||
e,
|
||||
)
|
||||
})
|
||||
.wait()
|
||||
.unwrap();
|
||||
|
||||
if verbosity >= 1 {
|
||||
log!("Clearing using `pacman -Sc`");
|
||||
}
|
||||
|
||||
let pacman_result = ShellCommand::pacman()
|
||||
.elevated()
|
||||
.args(pacman_args)
|
||||
.wait()
|
||||
.silent_unwrap(AppExitCode::PacmanError);
|
||||
|
||||
if pacman_result.success() {
|
||||
info!("Successfully cleared package cache");
|
||||
} else {
|
||||
crash!(AppExitCode::PacmanError, "Failed to clear package cache",);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,11 +1,13 @@
|
||||
mod aur_install;
|
||||
mod install;
|
||||
mod search;
|
||||
mod uninstall;
|
||||
mod upgrade;
|
||||
|
||||
pub use aur_install::*;
|
||||
pub use clean::*;
|
||||
pub use install::*;
|
||||
pub use search::{aur_search, repo_search as search};
|
||||
pub use uninstall::*;
|
||||
pub use upgrade::*;
|
||||
|
||||
mod aur_install;
|
||||
mod clean;
|
||||
mod install;
|
||||
mod search;
|
||||
mod uninstall;
|
||||
mod upgrade;
|
||||
|
||||
Loading…
Reference in New Issue