4 Commits

Author SHA1 Message Date
1516ce9ff3 Include section for supported AUR helpers.
Signed-off-by: Nicolás Ortega Froysa <nicolas@ortegas.org>
2024-05-07 18:07:13 +02:00
555ead272e Improve repository check.
Signed-off-by: Nicolás Ortega Froysa <nicolas@ortegas.org>
2024-05-07 18:05:11 +02:00
d616930208 Remove unnecessary sudo.
Signed-off-by: Nicolás Ortega Froysa <nicolas@ortegas.org>
2024-05-07 17:49:20 +02:00
347b49d5ee Find local package when reinstalling removed package.
Signed-off-by: Nicolás Ortega Froysa <nicolas@ortegas.org>
2024-05-02 13:36:07 +02:00
2 changed files with 33 additions and 8 deletions

View File

@ -45,6 +45,10 @@ There are two modes for undoing pacman transactions:
Look at the man-page (`man pacundo`) for more information. Look at the man-page (`man pacundo`) for more information.
### Supported AUR Helpers
- [yay](https://github.com/Jguer/yay)
## License ## License
This project is licensed under the terms & conditions of the Zlib license. This project is licensed under the terms & conditions of the Zlib license.

View File

@ -169,7 +169,8 @@ sub get_pkgmgr() {
my %pkgmgr = ( my %pkgmgr = (
name => $mgr, name => $mgr,
bin => $mgr_bin, bin => $mgr_bin,
search => "$sudo $mgr_bin -Ss", search => "$mgr_bin -Ss",
info => "$mgr_bin -Si",
install_remote => "$sudo $mgr_bin -S", install_remote => "$sudo $mgr_bin -S",
install_local => "$sudo $mgr_bin -U", install_local => "$sudo $mgr_bin -U",
remove => "$sudo $mgr_bin -R", remove => "$sudo $mgr_bin -R",
@ -178,17 +179,33 @@ sub get_pkgmgr() {
return \%pkgmgr; return \%pkgmgr;
} }
sub find_local_pkg($pkgmgr, $pkg_name, $pkg_ver) { sub find_local_pkg($pkgmgr, $pkg_name, $pkg_ver='') {
my $pkg_file = ''; my $pkg_file = '';
my $aur_dir = "$ENV{'XDG_CACHE_HOME'}/yay/$pkg_name"; my $pkg_pat;
my $repo = `$pkgmgr->{info} $pkg_name | awk '{ if (\$1 == "Repository") print \$3; }'`;;
if ($pkgmgr->{name} eq 'yay' && -d $aur_dir) { if ($pkg_ver ne '') {
$pkg_file = `ls $aur_dir/$pkg_name-$pkg_ver-*.pkg.tar.zst | tail -n1`; $pkg_pat = "$pkg_name-$pkg_ver-*.pkg.tar.zst";
} else { } else {
$pkg_file = `ls /var/cache/pacman/pkg/$pkg_name-$pkg_ver-*.pkg.tar.zst | tail -n1`; $pkg_pat = "$pkg_name-*.pkg.tar.zst";
}
if ($repo eq 'aur') {
my $aur_dir;
if ($pkgmgr->{name} eq 'yay') {
$aur_dir = "$ENV{'XDG_CACHE_HOME'}/yay/$pkg_name";
} else {
return '';
}
$pkg_file = `ls $aur_dir/$pkg_pat | tail -n1`;
} else {
$pkg_file = `ls /var/cache/pacman/pkg/$pkg_pat | tail -n1`;
} }
chomp($pkg_file); chomp($pkg_file);
return $pkg_file; return $pkg_file;
} }
@ -227,8 +244,12 @@ foreach my $tx (@undo_txs) {
if ($tx->{action} eq 'installed') { if ($tx->{action} eq 'installed') {
$remove_pkgs .= "$tx->{pkg_name} "; $remove_pkgs .= "$tx->{pkg_name} ";
} elsif ($tx->{action} eq 'removed') { } elsif ($tx->{action} eq 'removed') {
# TODO: install local package if available my $pkg_file = &find_local_pkg($pkgmgr, $tx->{pkg_name});
$remote_install_pkgs .= "$tx->{pkg_name} "; if ($pkg_file eq '') {
$remote_install_pkgs .= "$tx->{pkg_name} ";
} else {
$local_install_pkgs .= "$pkg_file ";
}
} else { } else {
my $pkg_file = &find_local_pkg($pkgmgr, $tx->{pkg_name}, $tx->{oldver}); my $pkg_file = &find_local_pkg($pkgmgr, $tx->{pkg_name}, $tx->{oldver});
if ($pkg_file eq '') { if ($pkg_file eq '') {