From be2bb2b27d61a39bff6efd890c3d519c39db321e Mon Sep 17 00:00:00 2001 From: J Pipkin Date: Sat, 12 Jan 2013 04:14:03 -0600 Subject: implement failure-dependent exit statuses, ask to proceed if a failure is encountered during the process --- sboremove | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sboremove') diff --git a/sboremove b/sboremove index 7479f29..95bd935 100755 --- a/sboremove +++ b/sboremove @@ -46,7 +46,7 @@ GetOptions( show_usage and exit 0 if $help; show_version and exit 0 if $vers; -show_usage and exit 0 unless exists $ARGV[0]; +show_usage and exit 1 unless exists $ARGV[0]; # ensure that all provided arguments are valid sbos my @sbos; @@ -59,7 +59,7 @@ for my $sbo (@ARGV) { say "Unable to locate $sbo in the SlackBuilds.org tree." } } -exit 0 unless exists $sbos[0]; +exit 1 unless exists $sbos[0]; # # wrapper to pull the list of requirements for a given sbo # sub get_requires ($) { -- cgit v1.2.3 From e95685f4330b20cc660c69b803c3ce90f33bc430 Mon Sep 17 00:00:00 2001 From: J Pipkin Date: Sat, 12 Jan 2013 04:58:23 -0600 Subject: resolve items marked TODO --- sboremove | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'sboremove') diff --git a/sboremove b/sboremove index 95bd935..0aa0fb8 100755 --- a/sboremove +++ b/sboremove @@ -61,14 +61,6 @@ for my $sbo (@ARGV) { } exit 1 unless exists $sbos[0]; -# # wrapper to pull the list of requirements for a given sbo -# sub get_requires ($) { -# my $location = get_sbo_location(shift); -# return unless $location; -# my $info = get_from_info(LOCATION => $location, GET => 'REQUIRES'); -# return $$info[0] ne '' ? $info : undef; -# } - # Create full queue. my ($remove_queue, %warnings); for my $sbo (@sbos) { @@ -156,8 +148,14 @@ FIRST: for my $remove (@$remove_queue) { if ( "%README%" ~~ @reqz ) { say "It is recommended that you view the README before continuing."; print "Display README now? [y]: "; - my $readme = get_readme_contents get_sbo_location($remove); - print "\n" . $readme if =~ /^[Yy\n]/; + if ( =~ /^[Yy\n]/) { + my ($readme, $exit) = get_readme_contents get_sbo_location($remove); + if ($exit) { + warn "Unable to open README for $remove.\n"; + } else { + print "\n" . $readme; + } + } } # Determine default behavior for prompt -- cgit v1.2.3