percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-20 10:55:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change version_check_file() to prefer global system dirs first.

Browse Source
This commit is contained in:
Daniel Nichter
2013-02-14 08:49:57 -07:00
parent 4545926556
commit 877d1a3b26
20 changed files with 384 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bin/pt-variable-advisor
View File

@@ -4315,11 +4315,26 @@ eval {
require HTTPMicro;
};
sub version_check_file {
return File::Spec->catfile(
File::Spec->tmpdir(),
'percona-version-check-2.2'
{
my $file = 'percona-version-check';
my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.';
my @vc_dirs = (
'/etc/percona',
'/etc/percona-toolkit',
'/tmp',
"$home",
);
sub version_check_file {
foreach my $dir ( @vc_dirs ) {
if ( -d $dir && -w $dir ) {
PTDEBUG && _d('Version check file', $file, 'in', $dir);
return $dir . '/' . $file;
}
}
PTDEBUG && _d('Version check file', $file, 'in', $ENV{PWD});
return $file; # in the CWD
}
}
sub version_check_time_limit {