@@ -1000,7 +1000,7 @@ sub execute_system_command {
10001000
10011001 # Be less verbose for commands that are expected to fail on some systems
10021002 if ( $command !~
1003- / ^(dmesg|lspci|dmidecode|ipconfig|isainfo|bootinfo|ver|wmic|lsattr|prtconf|swapctl|swapinfo|svcprop|ps|ping|ifconfig|ip|hostname|who|free|top|uptime|netstat|sysctl)/
1003+ / ^(dmesg|lspci|dmidecode|ipconfig|isainfo|bootinfo|ver|wmic|lsattr|prtconf|swapctl|swapinfo|svcprop|ps|ping|ifconfig|ip|hostname|who|free|top|uptime|netstat|sysctl|mysql|mariadb )/
10041004 )
10051005 {
10061006 badprint " System command failed: $command " ;
@@ -1009,7 +1009,7 @@ sub execute_system_command {
10091009 }
10101010
10111011 # Return based on calling context
1012- return wantarray ? @output : join ( " \n " , @output );
1012+ return wantarray ? @output : join ( " " , @output );
10131013}
10141014
10151015if ($is_win ) {
@@ -1149,7 +1149,7 @@ sub mysql_setup {
11491149 . ( ( $opt {pass } ne 0 ) ? " -p'$opt {pass}' " : " " )
11501150 . $remotestring ;
11511151 my $loginstatus =
1152- ` $mysqlcmd -Nrs -e 'select "mysqld is alive";' $mysqllogin 2>&1 ` ;
1152+ execute_system_command( " $mysqlcmd -Nrs -e 'select \ " mysqld is alive\ " ;' $mysqllogin " ) ;
11531153 if ( $loginstatus =~ / mysqld is alive/ ) {
11541154 goodprint " Logged in using credentials passed on the command line" ;
11551155 return 1;
@@ -1175,7 +1175,7 @@ sub mysql_setup {
11751175 }
11761176 $mysqllogin .= $remotestring ;
11771177
1178- $loginstatus = ` $mysqladmincmd ping $mysqllogin 2>&1 ` ;
1178+ $loginstatus = execute_system_command( " $mysqladmincmd ping $mysqllogin " ) ;
11791179 if ( $loginstatus =~ / mysqld is alive/ ) {
11801180 goodprint " Logged in using credentials with prompted password" ;
11811181 return 1;
@@ -1201,7 +1201,7 @@ sub mysql_setup {
12011201
12021202 # mysql-quickbackup is installed
12031203 $mysqllogin = " -u $mysql_login -p$mysql_pass " ;
1204- my $loginstatus = ` mysqladmin $mysqllogin ping 2>&1 ` ;
1204+ my $loginstatus = execute_system_command( " mysqladmin $mysqllogin ping" ) ;
12051205 if ( $loginstatus =~ / mysqld is alive/ ) {
12061206 goodprint " Logged in using credentials from mysql-quickbackup." ;
12071207 return 1;
@@ -1217,13 +1217,13 @@ sub mysql_setup {
12171217
12181218 # It's a Plesk box, use the available credentials
12191219 $mysqllogin = " -u admin -p`cat /etc/psa/.psa.shadow`" ;
1220- my $loginstatus = ` $mysqladmincmd ping $mysqllogin 2>&1 ` ;
1220+ my $loginstatus = execute_system_command( " $mysqladmincmd ping $mysqllogin " ) ;
12211221 unless ( $loginstatus =~ / mysqld is alive/ ) {
12221222
12231223 # Plesk 10+
12241224 $mysqllogin =
12251225 " -u admin -p`/usr/local/psa/bin/admin --show-password`" ;
1226- $loginstatus = ` $mysqladmincmd ping $mysqllogin 2>&1 ` ;
1226+ $loginstatus = execute_system_command( " $mysqladmincmd ping $mysqllogin " ) ;
12271227 unless ( $loginstatus =~ / mysqld is alive/ ) {
12281228 badprint
12291229" Attempted to use login credentials from Plesk and Plesk 10+, but they failed." ;
@@ -1246,7 +1246,7 @@ sub mysql_setup {
12461246
12471247 $mysqllogin = " -u $mysqluser -p$mysqlpass " ;
12481248
1249- my $loginstatus = ` mysqladmin ping $mysqllogin 2>&1 ` ;
1249+ my $loginstatus = execute_system_command( " mysqladmin ping $mysqllogin " ) ;
12501250 unless ( $loginstatus =~ / mysqld is alive/ ) {
12511251 badprint
12521252" Attempted to use login credentials from DirectAdmin, but they failed." ;
@@ -1260,7 +1260,7 @@ sub mysql_setup {
12601260
12611261 # We have a Debian maintenance account, use it
12621262 $mysqllogin = " --defaults-file=/etc/mysql/debian.cnf" ;
1263- my $loginstatus = ` $mysqladmincmd $mysqllogin ping 2>&1 ` ;
1263+ my $loginstatus = execute_system_command( " $mysqladmincmd $mysqllogin ping" ) ;
12641264 if ( $loginstatus =~ / mysqld is alive/ ) {
12651265 goodprint
12661266 " Logged in using credentials from Debian maintenance account." ;
@@ -1280,7 +1280,7 @@ sub mysql_setup {
12801280 debugprint " MySQL Client Default File: $opt {'defaults-file'}" ;
12811281
12821282 $mysqllogin = " --defaults-file=" . $opt {' defaults-file' };
1283- my $loginstatus = ` $mysqladmincmd $mysqllogin ping 2>&1 ` ;
1283+ my $loginstatus = execute_system_command( " $mysqladmincmd $mysqllogin ping" ) ;
12841284 if ( $loginstatus =~ / mysqld is alive/ ) {
12851285 goodprint " Logged in using credentials from defaults file account." ;
12861286 return 1;
@@ -1297,7 +1297,7 @@ sub mysql_setup {
12971297 " MySQL Client Extra Default File: $opt {'defaults-extra-file'}" ;
12981298
12991299 $mysqllogin = " --defaults-extra-file=" . $opt {' defaults-extra-file' };
1300- my $loginstatus = ` $mysqladmincmd $mysqllogin ping 2>&1 ` ;
1300+ my $loginstatus = execute_system_command( " $mysqladmincmd $mysqllogin ping" ) ;
13011301 if ( $loginstatus =~ / mysqld is alive/ ) {
13021302 goodprint
13031303 " Logged in using credentials from extra defaults file account." ;
@@ -1317,7 +1317,7 @@ sub mysql_setup {
13171317 # } else {
13181318 infoprint " Using mysql to check login" ;
13191319 my $loginstatus =
1320- ` $mysqlcmd $remotestring -Nrs -e 'select "mysqld is alive"' --connect-timeout=3 2>&1 ` ;
1320+ execute_system_command( " $mysqlcmd $remotestring -Nrs -e 'select \ " mysqld is alive\ " ' --connect-timeout=3" ) ;
13211321
13221322 # }
13231323
@@ -1382,7 +1382,7 @@ sub mysql_setup {
13821382 }
13831383 }
13841384 $mysqllogin .= $remotestring ;
1385- my $loginstatus = ` $mysqladmincmd ping $mysqllogin 2>&1 ` ;
1385+ my $loginstatus = execute_system_command( " $mysqladmincmd ping $mysqllogin " ) ;
13861386 if ( $loginstatus =~ / mysqld is alive/ ) {
13871387
13881388 # print STDERR "";
0 commit comments