percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-12 06:00:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use 6 X with mktemp to make it work on some platforms and update all tools.

Browse Source
This commit is contained in:
Daniel Nichter
2012-05-16 11:38:48 -06:00
parent 598726c2b2
commit d46285342a
8 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pt-ioprofile
View File

@@ -425,7 +425,7 @@ mk_tmpdir() {
else else
local tool="${0##*/}" local tool="${0##*/}"
local pid="$$" local pid="$$"
TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
|| die "Cannot make secure tmpdir" || die "Cannot make secure tmpdir"
fi fi
} }

10
bin/pt-mext
View File

@@ -29,24 +29,24 @@ fi
TMPDIR="" TMPDIR=""
mk_tmpdir() { mk_tmpdir() {
local dir=${1:-""} local dir="${1:-""}"
if [ -n "$dir" ]; then if [ -n "$dir" ]; then
if [ ! -d "$dir" ]; then if [ ! -d "$dir" ]; then
mkdir $dir || die "Cannot make tmpdir $dir" mkdir "$dir" || die "Cannot make tmpdir $dir"
fi fi
TMPDIR="$dir" TMPDIR="$dir"
else else
local tool=`basename $0` local tool="${0##*/}"
local pid="$$" local pid="$$"
TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
|| die "Cannot make secure tmpdir" || die "Cannot make secure tmpdir"
fi fi
} }
rm_tmpdir() { rm_tmpdir() {
if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then
rm -rf $TMPDIR rm -rf "$TMPDIR"
fi fi
TMPDIR="" TMPDIR=""
} }

2
bin/pt-mysql-summary
View File

@@ -445,7 +445,7 @@ mk_tmpdir() {
else else
local tool="${0##*/}" local tool="${0##*/}"
local pid="$$" local pid="$$"
TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
|| die "Cannot make secure tmpdir" || die "Cannot make secure tmpdir"
fi fi
} }

2
bin/pt-pmp
View File

@@ -28,7 +28,7 @@ mk_tmpdir() {
else else
local tool="${0##*/}" local tool="${0##*/}"
local pid="$$" local pid="$$"
TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
|| die "Cannot make secure tmpdir" || die "Cannot make secure tmpdir"
fi fi
} }

13
bin/pt-sift
View File

@@ -22,30 +22,27 @@ usage() {
# See https://launchpad.net/percona-toolkit for more information. # See https://launchpad.net/percona-toolkit for more information.
# ########################################################################### # ###########################################################################
# pt-sift isn't ready for this yet.
#set -u
TMPDIR="" TMPDIR=""
mk_tmpdir() { mk_tmpdir() {
local dir=${1:-""} local dir="${1:-""}"
if [ -n "$dir" ]; then if [ -n "$dir" ]; then
if [ ! -d "$dir" ]; then if [ ! -d "$dir" ]; then
mkdir $dir || die "Cannot make tmpdir $dir" mkdir "$dir" || die "Cannot make tmpdir $dir"
fi fi
TMPDIR="$dir" TMPDIR="$dir"
else else
local tool=`basename $0` local tool="${0##*/}"
local pid="$$" local pid="$$"
TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
|| die "Cannot make secure tmpdir" || die "Cannot make secure tmpdir"
fi fi
} }
rm_tmpdir() { rm_tmpdir() {
if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then
rm -rf $TMPDIR rm -rf "$TMPDIR"
fi fi
TMPDIR="" TMPDIR=""
} }

2
bin/pt-stalk
View File

@@ -439,7 +439,7 @@ mk_tmpdir() {
else else
local tool="${0##*/}" local tool="${0##*/}"
local pid="$$" local pid="$$"
TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
|| die "Cannot make secure tmpdir" || die "Cannot make secure tmpdir"
fi fi
} }

2
bin/pt-summary
View File

@@ -452,7 +452,7 @@ mk_tmpdir() {
else else
local tool="${0##*/}" local tool="${0##*/}"
local pid="$$" local pid="$$"
TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
|| die "Cannot make secure tmpdir" || die "Cannot make secure tmpdir"
fi fi
} }

2
lib/bash/tmpdir.sh
View File

@@ -45,7 +45,7 @@ mk_tmpdir() {
else else
local tool="${0##*/}" local tool="${0##*/}"
local pid="$$" local pid="$$"
TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \ TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXXX` \
|| die "Cannot make secure tmpdir" || die "Cannot make secure tmpdir"
fi fi
} }