aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Pipkin <j@dawnrazor.net>2012-05-31 15:43:48 -0500
committerJacob Pipkin <j@dawnrazor.net>2012-05-31 15:43:48 -0500
commit9b8bfae0b3b13566ea5b7010b8e534e33db94351 (patch)
treeea512870781477e78da2fd5fec195a16a2fd3c7e
parent76336e45482c08ee962ab1efc857e1b66b18b1e6 (diff)
downloadsbotools2-9b8bfae0b3b13566ea5b7010b8e534e33db94351.tar.xz
rename grok_readme to grok_requirements, remove extraneous code in get_readme_path
-rwxr-xr-xsboupgrade9
1 files changed, 4 insertions, 5 deletions
diff --git a/sboupgrade b/sboupgrade
index 5c164b8..d305bae 100755
--- a/sboupgrade
+++ b/sboupgrade
@@ -76,13 +76,12 @@ for my $sbo_name (@ARGV) {
sub get_readme_path {
script_error ('get_readme_path requires an argument.') unless exists $_[0];
my $sbo = shift;
- my $location = $locations{$sbo};
- return $location .'/README';
+ return $locations{$sbo} .'/README';
}
# this subroutine may be getting a little out of hand.
-sub grok_readme {
- script_error ('grok_readme requires two arguments') unless exists $_[1];
+sub grok_requirements {
+ script_error ('grok_requirements requires two arguments') unless exists $_[1];
my ($sbo, $readme) = @_;
my $readme_orig = $readme;
# work around missing period at end of list of requirements (given 2 \ns),
@@ -141,7 +140,7 @@ sub readme_prompt {
my $readme_path = get_readme_path ($sbo);
open my $readme_file, '<', $readme_path;
my $readme = do {local $/; <$readme_file>};
- unless (grok_readme ($sbo, $readme) ) {
+ unless (grok_requirements ($sbo, $readme) ) {
print "\n". $readme;
close $readme_file;
print "\nProceed with $sbo? [y]: ";