pacundo.pl

@@ -29,8 +29,8 @@ use feature qw(signatures);
 use Getopt::Std;
 use File::ReadBackwards;
 
-my $VERSION   = '1.0';
+my $VERSION   = "1.0";
-my $PROG_NAME = 'pacundo';
+my $PROG_NAME = "pacundo";
 
 sub print_version() {
 	print("$PROG_NAME v$VERSION\n");
@@ -60,8 +60,8 @@ sub read_txs($num_txs = 1) {
 	my $found_txs = 0;
 	my $in_tx = 0;
 	my @undo_txs;
-	my $pacman_log = File::ReadBackwards->new('/var/log/pacman.log') or
+	my $pacman_log = File::ReadBackwards->new("/var/log/pacman.log") or
-		die("Failed to load pacman log file.\n$!\n");
+		die("Failed to load pacman log file.\n$!");
 
 	while ($found_txs < $num_txs && defined(my $line = $pacman_log->readline)) {
 		unless ($in_tx) {
@@ -77,18 +77,18 @@ sub read_txs($num_txs = 1) {
 				$line =~ /\[ALPM\] (upgraded|downgraded) ([^\s]+) \((.*) -> (.*)\)/;
 			push(@undo_txs,
 				{
-					action   => $action,
+					'action' => $action,
-					pkg_name => $pkg_name,
+					'pkg_name' => $pkg_name,
-					oldver   => $oldver,
+					'oldver' => $oldver,
-					newver   => $newver,
+					'newver' => $newver,
 				}
 			);
 		} elsif ($line =~ /\[ALPM\] (installed|removed)/) {
 			my ($action, $pkg_name) = $line =~ /\[ALPM\] (installed|removed) ([^\s]+)/;
 			push(@undo_txs,
 				{
-					action   => $action,
+					'action' => $action,
-					pkg_name => $pkg_name,
+					'pkg_name' => $pkg_name,
 				}
 			);
 		}
@@ -118,7 +118,8 @@ $n, $tx->{action}, $tx->{pkg_name}
 		$n++;
 	}
 
-	print("Select transactions to undo (e.g. '1 2 3', '1-3')\n> ");
+	print("Select transactions to undo (e.g. '1 2 3', '1-3')\n");
+	print("> ");
 
 	my @sel = split(' ', <STDIN>);
 
@@ -128,7 +129,7 @@ $n, $tx->{action}, $tx->{pkg_name}
 		push(@sel, ($start..$end));
 	}
 
-	@sel = sort grep({!/[0-9]+-[0-9]+/} @sel);
+	@sel = sort grep({!/[0-9+]-[0-9+]/} @sel);
 
 	my @sel_undo;
 	push(@sel_undo, $undo_txs[$_-1]) foreach (@sel);
@@ -136,25 +137,25 @@ $n, $tx->{action}, $tx->{pkg_name}
 	return @sel_undo;
 }
 
-# NOTE: Currently this subroutine only works for pacman and yay. You'll have to
-# add options for additional AUR helpers.
 sub get_pkgmgr() {
-	# TODO: autodetect AUR helper
 	my $mgr = $ENV{DEFAULT_PKGMGR} // 'pacman';
-	my $mgr_bin = `which $mgr 2>&1`;
+	my $mgr_bin = `which $mgr`;
 
 	if ($? != 0) {
 		print(STDERR "Failed to find pacman executable. Are you using an ArchLinux system?\n");
 		exit 1;
 	}
 
+	my $mgr_cmd_search = "$mgr_bin -Ss";
+	my $mgr_cmd_install_remote = "$mgr_bin -S";
+	my $mgr_cmd_install_local = "$mgr_bin -U";
+
 	my %pkgmgr = (
 		name           => $mgr,
 		bin            => $mgr_bin,
-		search         => "$mgr_bin -Ss",
+		search         => $mgr_cmd_search,
-		install_remote => "$mgr_bin -S",
+		install_remote => $mgr_cmd_install_remote,
-		install_local  => "$mgr_bin -U",
+		install_local  => $mgr_cmd_install_local,
-		remove         => "$mgr_bin -R",
 	);
 
 	return \%pkgmgr;