percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-12 14:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass --interactive to instal().

Browse Source
This commit is contained in:
Daniel Nichter
2013-06-14 12:27:26 -07:00
parent 62648bf213
commit f49bbde71b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/pt-agent
View File

@@ -5293,6 +5293,7 @@ sub main {
install( install(
OptionParser => $o, OptionParser => $o,
Cxn => $cxn, Cxn => $cxn,
interactive => $o->get('interactive'),
); );
return $exit_status; return $exit_status;
} }
@@ -7970,6 +7971,9 @@ sub install {
my $o = $args{OptionParser}; my $o = $args{OptionParser};
my $cxn = $args{Cxn}; my $cxn = $args{Cxn};
# Optional args
my $interactive = $args{interactive};
# ######################################################################## # ########################################################################
# Pre-install checklist # Pre-install checklist
# ######################################################################## # ########################################################################
@@ -7994,11 +7998,15 @@ sub install {
# Must have a valid API key. # Must have a valid API key.
my $api_key = $o->get('api-key'); my $api_key = $o->get('api-key');
if ( !$api_key ) { if ( !$api_key ) {
if (-t STDIN) { if ( $interactive || -t STDIN ) {
while ( !$api_key ) { while ( !$api_key ) {
print "Enter your API key: "; print "Enter your API key: ";
$api_key = <STDIN>; $api_key = <STDIN>;
chomp($api_key) if $api_key; chomp($api_key) if $api_key;
if ( !$api_key || length($api_key) < 32 ) {
warn "Invalid API key; it should be at least 32 characters long. Please try again.\n";
$api_key = '';
}
} }
} }
else { else {
@@ -8026,7 +8034,7 @@ sub install {
die "Sorry, an error occurred while verifying the API key: $e"; die "Sorry, an error occurred while verifying the API key: $e";
} }
elsif ( !$entry_links ) { elsif ( !$entry_links ) {
die "API key $api_key is not valid, or the connection to the Percona " die "The API key $api_key is not valid, or the connection to the Percona "
. "Web API failed. Please check the API key and try again.\n"; . "Web API failed. Please check the API key and try again.\n";
} }
else { else {