diff options
| -rwxr-xr-x | sbocheck | 15 | ||||
| -rwxr-xr-x | t/01-test.t | 14 |
2 files changed, 14 insertions, 15 deletions
@@ -109,16 +109,15 @@ sub get_update_list { } push @listing, $str; } - return \@listing; + return @listing; } # print list of updates sub print_output { - exists $_[0] or script_error('print_output requires an argument'); - my $listing = shift; - if (exists $$listing[0]) { + my @listing = @_; + if (@listing) { print "\n"; - say $_ for @$listing; + say $_ for @listing; print "\n"; # save a log of available updates my $logfile = '/var/log/sbocheck.log'; @@ -128,7 +127,7 @@ sub print_output { if ($exit) { warn $log_fh if $exit; } else { - say {$log_fh} $_ for @$listing; + say {$log_fh} $_ for @listing; close $log_fh; say "A copy of the above result is kept in $logfile\n"; } @@ -137,7 +136,7 @@ sub print_output { } } -my $output = get_update_list(); -print_output($output); +my @listing = get_update_list(); +print_output(@listing); exit 0; diff --git a/t/01-test.t b/t/01-test.t index 153e438..84c6edc 100755 --- a/t/01-test.t +++ b/t/01-test.t @@ -396,13 +396,13 @@ subtest 'get_update_list tests', sub { plan tests => 5; - my $listing; - stdout_is(sub { $listing = get_update_list(); }, "Checking for updated SlackBuilds...\n", 'output of get_update_list() good'); - s/\s//g for @$listing; - is (shift(@$listing), 'adobe-reader9.5.1_enu<needsupdating(9.5.1fromSBo)', 'get_update_list listing good for adobe-reader'); - is (shift(@$listing), 'ffmpeg0.8.7<needsupdating(0.11.1fromSBo)', 'get_update_list listing good for ffmpeg'); - is (shift(@$listing), 'libdvdnav4.1.3<needsupdating(4.2.0fromSBo)', 'get_update_list listing test, libdvdnav'); - is (shift(@$listing), 'mutagen1.15<needsupdating(1.20fromSBo)', 'get_update_list listing good for mutagen'); + my @listing; + stdout_is(sub { @listing = get_update_list(); }, "Checking for updated SlackBuilds...\n", 'output of get_update_list() good'); + s/\s//g for @listing; + is (shift(@listing), 'adobe-reader9.5.1_enu<needsupdating(9.5.1fromSBo)', 'get_update_list listing good for adobe-reader'); + is (shift(@listing), 'ffmpeg0.8.7<needsupdating(0.11.1fromSBo)', 'get_update_list listing good for ffmpeg'); + is (shift(@listing), 'libdvdnav4.1.3<needsupdating(4.2.0fromSBo)', 'get_update_list listing test, libdvdnav'); + is (shift(@listing), 'mutagen1.15<needsupdating(1.20fromSBo)', 'get_update_list listing good for mutagen'); }; # 47: remove_stuff test - can only really test for invalid input |