From fe526cc85c24aaa9bd33546adeb6e1f13615777a Mon Sep 17 00:00:00 2001 From: Jacob Pipkin Date: Thu, 7 Jun 2012 01:31:02 -0500 Subject: sboupgrade: yet more reduction of excess code --- sboupgrade | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sboupgrade b/sboupgrade index a7cdef9..af6d948 100755 --- a/sboupgrade +++ b/sboupgrade @@ -199,16 +199,15 @@ sub readme_prompt { my $fh = open_read (get_readme_path (shift) ); my $readme = do {local $/; <$fh>}; close $fh; - unless (grok_requirements ($sbo, $readme) ) { - grok_user_group ($readme); - my $opts = grok_options ($readme); - print "\n". $readme if ($opts == 7 || ! $opts); - my $name = $compat32 eq 'TRUE' ? "$sbo-compat32" : $sbo; - print "\nProceed with $name? [y]: "; - return unless =~ /^[Yy\n]/; - return $opts if defined $opts; - return 1; - } + grok_requirements ($sbo, $readme); + grok_user_group ($readme); + my $opts = grok_options ($readme); + print "\n". $readme if ($opts == 7 || ! $opts); + my $name = $compat32 eq 'TRUE' ? "$sbo-compat32" : $sbo; + print "\nProceed with $name? [y]: "; + return unless =~ /^[Yy\n]/; + return $opts if defined $opts; + return 1; } # do the things with the provided sbos - whether upgrades or new installs. -- cgit v1.2.3