\t -> 4 spaces

This commit is contained in:
M. Hasbini 2016-02-14 02:24:36 +02:00
parent 69ffbc7126
commit b273998483

View file

@ -492,9 +492,9 @@ sub mysql_setup {
} }
infoprint "Performing tests on $opt{host}:$opt{port}"; infoprint "Performing tests on $opt{host}:$opt{port}";
$remotestring = " -h $opt{host} -P $opt{port}"; $remotestring = " -h $opt{host} -P $opt{port}";
if (($opt{host} ne "127.0.0.1") && ($opt{host} ne "localhost")) { if (($opt{host} ne "127.0.0.1") && ($opt{host} ne "localhost")) {
$doremote = 1; $doremote = 1;
} }
} }
# Did we already get a username and password passed on the command line? # Did we already get a username and password passed on the command line?
@ -598,7 +598,7 @@ sub mysql_setup {
# Login went just fine # Login went just fine
$mysqllogin = " $remotestring "; $mysqllogin = " $remotestring ";
# Did this go well because of a .my.cnf file or is there no password set? # Did this go well because of a .my.cnf file or is there no password set?
my $userpath = `printenv HOME`; my $userpath = `printenv HOME`;
if ( length($userpath) > 0 ) { if ( length($userpath) > 0 ) {
chomp($userpath); chomp($userpath);
@ -615,27 +615,27 @@ sub mysql_setup {
badprint "Attempted to use login credentials, but they were invalid"; badprint "Attempted to use login credentials, but they were invalid";
exit 1; exit 1;
} }
my ($name, $password); my ($name, $password);
# If --user is defined no need to ask for username # If --user is defined no need to ask for username
if( $opt{user} ne 0 ) if( $opt{user} ne 0 )
{ {
$name = $opt{user}; $name = $opt{user};
} }
else{ else{
print STDERR "Please enter your MySQL administrative login: "; print STDERR "Please enter your MySQL administrative login: ";
$name = <STDIN>; $name = <STDIN>;
} }
# If --pass is defined no need to ask for password # If --pass is defined no need to ask for password
if( $opt{pass} ne 0 ) if( $opt{pass} ne 0 )
{ {
$password = $opt{pass}; $password = $opt{pass};
} }
else{ else{
print STDERR "Please enter your MySQL administrative password: "; print STDERR "Please enter your MySQL administrative password: ";
system("stty -echo >$devnull 2>&1"); system("stty -echo >$devnull 2>&1");
$password = <STDIN>; $password = <STDIN>;
system("stty echo >$devnull 2>&1"); system("stty echo >$devnull 2>&1");
} }
chomp($password); chomp($password);
chomp($name); chomp($name);
$mysqllogin = "-u $name"; $mysqllogin = "-u $name";