diff options
| -rwxr-xr-x | sbocheck | 2 | ||||
| -rwxr-xr-x | sbofind | 21 |
2 files changed, 10 insertions, 13 deletions
@@ -32,7 +32,7 @@ my @listing; for my $key (keys @updates) { my $string = "$updates[$key]{name}-$updates[$key]{installed}"; $string .= " < needs updating (SBo has $updates[$key]{update})\n"; - push (@listing, $string); + push @listing, $string; } if (exists $listing[0]) { @@ -54,16 +54,13 @@ my $name_regex = qr/NAME:\s+(.*\Q$search\E.*)$/i; my $loc_regex = qr/LOCATION:\s+(.*)$/; my $fh = open_read ("$config{SBO_HOME}/SLACKBUILDS.TXT"); FIRST: while (my $line = <$fh>) { - unless ($found eq 'TRUE') { - if ($name = ($line =~ $name_regex)[0]) { - $found = 'TRUE'; - next FIRST; - } + if ($found eq 'FALSE') { + $found eq 'TRUE', next FIRST if $name = ($line =~ $name_regex)[0]; } else { if (my ($location) = ($line =~ $loc_regex)[0]) { $found = 'FALSE'; $location =~ s#^\.##; - push (@findings, {$name => $config{SBO_HOME} . $location} ); + push @findings, {$name => $config{SBO_HOME} . $location}; } } } @@ -83,13 +80,13 @@ if (exists $findings[0]) { my @listing = ("\n"); for my $hash (@findings) { while (my ($key, $value) = each %{$hash}) { - push (@listing, "SBo: $key\n"); - push (@listing, "Path: $value\n"); - push (@listing, "info: ". get_file_contents - ("$value/$key.info") ) if $show_info eq 'TRUE'; - push (@listing, "README: ". get_file_contents ("$value/README") ) + push @listing, "SBo: $key\n"; + push @listing, "Path: $value\n"; + push @listing, "info: ". get_file_contents ("$value/$key.info") + if $show_info eq 'TRUE'; + push @listing, "README: ". get_file_contents ("$value/README") if $show_readme eq 'TRUE'; - push (@listing, "\n"); + push @listing, "\n"; } } print $_ for @listing; |