hhf/MySQLTuner-perl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use portable /dev/null from File::Spec.

Browse source
This commit is contained in:
Ville Skyttä 2011-04-02 15:03:32 +03:00
parent 32b1eb2111
commit 6add6186bc
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mysqltuner.pl
View file

@ -37,6 +37,7 @@
use strict; use strict;
use warnings; use warnings;
use diagnostics; use diagnostics;
use File::Spec;
use Getopt::Long; use Getopt::Long;
# Set up a few variables for use in the script # Set up a few variables for use in the script
@ -116,6 +117,8 @@ sub usage {
exit; exit;
} }
my $devnull = File::Spec->devnull();
# Setting up the colors for the print styles # Setting up the colors for the print styles
my $good = ($opt{nocolor} == 0)? "[\e[0;32mOK\e[0m]" : "[OK]" ; my $good = ($opt{nocolor} == 0)? "[\e[0;32mOK\e[0m]" : "[OK]" ;
my $bad = ($opt{nocolor} == 0)? "[\e[0;31m!!\e[0m]" : "[!!]" ; my $bad = ($opt{nocolor} == 0)? "[\e[0;31m!!\e[0m]" : "[!!]" ;
@ -308,9 +311,9 @@ sub mysql_setup {
print STDERR "Please enter your MySQL administrative login: "; print STDERR "Please enter your MySQL administrative login: ";
my $name = <>; my $name = <>;
print STDERR "Please enter your MySQL administrative password: "; print STDERR "Please enter your MySQL administrative password: ";
system("stty -echo >/dev/null 2>&1"); system("stty -echo >$devnull 2>&1");
my $password = <>; my $password = <>;
system("stty echo >/dev/null 2>&1"); system("stty echo >$devnull 2>&1");
chomp($password); chomp($password);
chomp($name); chomp($name);
$mysqllogin = "-u $name"; $mysqllogin = "-u $name";
@ -361,7 +364,7 @@ sub get_all_vars {
# have_* for engines is deprecated and will be removed in MySQL 5.6; # have_* for engines is deprecated and will be removed in MySQL 5.6;
# check SHOW ENGINES and set corresponding old style variables. # check SHOW ENGINES and set corresponding old style variables.
# Also works around MySQL bug #59393 wrt. skip-innodb # Also works around MySQL bug #59393 wrt. skip-innodb
my @mysqlenginelist = `mysql $mysqllogin -Bse "SHOW ENGINES;" 2>/dev/null`; my @mysqlenginelist = `mysql $mysqllogin -Bse "SHOW ENGINES;" 2>$devnull`;
foreach my $line (@mysqlenginelist) { foreach my $line (@mysqlenginelist) {
if ($line =~ /^([a-zA-Z_]+)\s+(\S+)/) { if ($line =~ /^([a-zA-Z_]+)\s+(\S+)/) {
my $engine = lc($1); my $engine = lc($1);
@ -412,10 +415,10 @@ sub validate_tuner_version {
my $update; my $update;
my $url = "http://mysqltuner.com/versioncheck.php?v=$tunerversion"; my $url = "http://mysqltuner.com/versioncheck.php?v=$tunerversion";
if (-e "/usr/bin/curl") { if (-e "/usr/bin/curl") {
$update = `/usr/bin/curl --connect-timeout 5 '$url' 2>/dev/null`; $update = `/usr/bin/curl --connect-timeout 5 '$url' 2>$devnull`;
chomp($update); chomp($update);
} elsif (-e "/usr/bin/wget") { } elsif (-e "/usr/bin/wget") {
$update = `/usr/bin/wget -e timestamping=off -T 5 -O - '$url' 2>/dev/null`; $update = `/usr/bin/wget -e timestamping=off -T 5 -O - '$url' 2>$devnull`;
chomp($update); chomp($update);
} }
if ($update eq 1) { if ($update eq 1) {