summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Neidhardt <ambrevar@gmail.com>2014-01-23 00:07:08 +0100
committerAllan McRae <allan@archlinux.org>2014-02-02 07:12:29 +0100
commit1e07af1b0a16d9f8e42a76d00de8558e49cb57b7 (patch)
treefd2002381be101949a85c962245244158d2caa7e
parentfe19a0c58d8c2d5b8fa6ca4a55647bbfe6bf5b51 (diff)
downloadpacman-1e07af1b0a16d9f8e42a76d00de8558e49cb57b7.tar.gz
pacman-1e07af1b0a16d9f8e42a76d00de8558e49cb57b7.tar.xz
pacsearch: using pacman color theme
No more per-repo coloring: this was not Arch-agnostic, and there is no reasonable, simple way to color repos in a consistant manner with only 6 colors. 'local' is in red: this way we benefit from the pacman -Ss && pacman -Qs combo. to_color subroutine: it takes an array instead of a string, this is faster and simpler. Signed-off-by: Pierre Neidhardt <ambrevar@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--contrib/pacsearch.in32
1 files changed, 14 insertions, 18 deletions
diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in
index d03778e2..180694b6 100644
--- a/contrib/pacsearch.in
+++ b/contrib/pacsearch.in
@@ -69,21 +69,20 @@ $RESET = color('reset');
# localization
my $LC_INSTALLED = `gettext pacman installed`;
-# color a "repo/pkgname pkgver" line based on the repository name
+# Color a "repo/pkgname pkgver (groups) [installed]" line.
+# We try to stick to pacman colors.
sub to_color {
- my $line = shift;
- # get the installed text colored first
- $line =~ s/(\[.*\]$)/$CYAN$1$RESET/;
- # and now the repo and dealings
- $line =~ s/(^core\/.*)/$MAGENTA$1$RESET/;
- $line =~ s/(^extra\/.*)/$MAGENTA$1$RESET/;
- $line =~ s/(^community\/.*)/$MAGENTA$1$RESET/;
- $line =~ s/(^testing\/.*)/$MAGENTA$1$RESET/;
- $line =~ s/(^community-testing\/.*)/$MAGENTA$1$RESET/;
- $line =~ s/(^multilib\/.*)/$MAGENTA$1$RESET/;
- $line =~ s/(^local\/.*)/$RED$1$RESET/;
- # any other unknown repository
- $line =~ s/(^[\w-]*\/.*)/$RED$1$RESET/;
+ my @v = @_;
+ my $line = "$RESET$BOLD";
+ if ( "$v[0]" eq "local" ) {
+ $line .= "$RED";
+ } else {
+ $line .= "$MAGENTA";
+ }
+ $line .= "$v[0]/$RESET$BOLD$v[1] $GREEN$v[2]";
+ $line .= " $BLUE$v[3]" if $v[3] ne "";
+ $line .= " $CYAN$v[4]" if $v[4] ne "";
+ $line .= " $RESET";
return $line;
}
@@ -145,10 +144,7 @@ foreach $_ (@querypkgs) {
# sort by original order (the last field) and print
foreach $_ ( sort{ @{$allpkgs{$a}}[6] <=> @{$allpkgs{$b}}[6] } keys %allpkgs) {
my @v = @{$allpkgs{$_}};
- my $line = "$v[0]/$v[1] $v[2]";
- $line .= " $v[3]" if $v[3] ne "";
- $line .= " $v[4]" if $v[4] ne "";
- $line = to_color($line);
+ my $line = to_color(@v);
# print colorized "repo/pkgname pkgver ..." string with possible installed text
print "$line\n";
print "$v[5]\n";