Skip to content

Commit

Permalink
Merge branch 'brew'
Browse files Browse the repository at this point in the history
  • Loading branch information
daisieh committed Jul 22, 2014
1 parent 5275b63 commit 0ac7d52
Showing 1 changed file with 23 additions and 18 deletions.
41 changes: 23 additions & 18 deletions configure.pl
Expand Up @@ -5,6 +5,8 @@
use Configuration;
use System;

my $no_interactive = shift;

# find or make config.txt:
my $config_file = "$FindBin::Bin/lib/config.txt";
unless (-e $config_file) {
Expand Down Expand Up @@ -105,25 +107,28 @@
print "If software is installed but not included in \$PATH, edit the appropriate line in config.txt.\n";
}

print "\nWould you like to run aTRAM functionality tests (may take a few minutes)? [Y/n]\n";
my $userpath = <STDIN>;
while ($userpath !~ /[yY]\n/) {
if ($userpath =~ /[nN]\n/) {
exit;
}
if ($userpath =~ /^\n/) {
last;

if (!(defined $no_interactive)) {
print "\nWould you like to run aTRAM functionality tests (may take a few minutes)? [Y/n]\n";
my $userpath = <STDIN>;
while ($userpath !~ /[yY]\n/) {
if ($userpath =~ /[nN]\n/) {
exit;
}
if ($userpath =~ /^\n/) {
last;
}
$userpath = <STDIN>;
}
$userpath = <STDIN>;
}

my $executing_path = $FindBin::Bin;
my $executing_path = $FindBin::Bin;

print $i++ .". Verifying aTRAM functionality, please wait...\n";
`$executing_path/test/test_all.pl`;
if ($? == 0) {
print "Looks good! You are ready to aTRAM it up!\n";
} else {
print "Something went wrong in testing...run \"aTRAM/test/test_all.pl debug\" and examine the results of debug.log.\n";
}
print $i++ .". Verifying aTRAM functionality, please wait...\n";
`$executing_path/test/test_all.pl`;
if ($? == 0) {
print "Looks good! You are ready to aTRAM it up!\n";
} else {
print "Something went wrong in testing...run \"aTRAM/test/test_all.pl debug\" and examine the results of debug.log.\n";
}

}

0 comments on commit 0ac7d52

Please sign in to comment.