aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Pipkin <j@dawnrazor.net>2012-06-07 01:31:02 -0500
committerJacob Pipkin <j@dawnrazor.net>2012-06-07 01:31:02 -0500
commitfe526cc85c24aaa9bd33546adeb6e1f13615777a (patch)
treed19a561d5a367365df7646718f389a74cae2f413
parentadf44bcf0863ee1381ea3e2fbda849304141ea9c (diff)
downloadsbotools2-fe526cc85c24aaa9bd33546adeb6e1f13615777a.tar.xz
sboupgrade: yet more reduction of excess code
-rwxr-xr-xsboupgrade19
1 files 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 <STDIN> =~ /^[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 <STDIN> =~ /^[Yy\n]/;
+ return $opts if defined $opts;
+ return 1;
}
# do the things with the provided sbos - whether upgrades or new installs.