Fixed asking for username/password when it's already passed.
This commit is contained in:
parent
c4dbc7e499
commit
69ffbc7126
1 changed files with 22 additions and 8 deletions
|
@ -615,13 +615,27 @@ sub mysql_setup {
|
|||
badprint "Attempted to use login credentials, but they were invalid";
|
||||
exit 1;
|
||||
}
|
||||
|
||||
my ($name, $password);
|
||||
# If --user is defined no need to ask for username
|
||||
if( $opt{user} ne 0 )
|
||||
{
|
||||
$name = $opt{user};
|
||||
}
|
||||
else{
|
||||
print STDERR "Please enter your MySQL administrative login: ";
|
||||
my $name = <>;
|
||||
$name = <STDIN>;
|
||||
}
|
||||
# If --pass is defined no need to ask for password
|
||||
if( $opt{pass} ne 0 )
|
||||
{
|
||||
$password = $opt{pass};
|
||||
}
|
||||
else{
|
||||
print STDERR "Please enter your MySQL administrative password: ";
|
||||
system("stty -echo >$devnull 2>&1");
|
||||
my $password = <>;
|
||||
$password = <STDIN>;
|
||||
system("stty echo >$devnull 2>&1");
|
||||
}
|
||||
chomp($password);
|
||||
chomp($name);
|
||||
$mysqllogin = "-u $name";
|
||||
|
|
Loading…
Reference in a new issue