Merge lp:~percona-toolkit-dev/percona-toolkit/use-mktemp-871438 into lp:~percona-toolkit-dev/percona-toolkit/pt-stalk-2.0

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-mext'
--- bin/pt-mext	2011-09-01 16:00:38 +0000
+++ bin/pt-mext	2012-02-01 16:31:24 +0000
@@ -17,7 +17,50 @@
    usage;
 fi
 
-FILE=/tmp/mext_temp_file;
+# ###########################################################################
+# tmpdir package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the Bazaar repository at,
+#   lib/bash/tmpdir.sh
+#   t/lib/bash/tmpdir.sh
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+
+# pt-mext isn't ready for this yet
+#set -u
+
+TMPDIR=""
+
+mk_tmpdir() {
+   local dir=${1:-""}
+
+   if [ -n "$dir" ]; then
+      if [ ! -d "$dir" ]; then
+         mkdir $dir || die "Cannot make tmpdir $dir"
+      fi
+      TMPDIR="$dir"
+   else
+      local tool=`basename $0`
+      local pid="$$"
+      TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
+         || die "Cannot make secure tmpdir"
+   fi
+}
+
+rm_tmpdir() {
+   if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then
+      rm -rf $TMPDIR
+   fi
+   TMPDIR=""
+}
+
+# ###########################################################################
+# End tmpdir package
+# ###########################################################################
+
+mk_tmpdir
+
+FILE=`mktemp -p $TMPDIR mext_temp_file.XXXXXX`;
 NUM=0;
 REL=0;
 rm -f $FILE*;

=== modified file 'bin/pt-mysql-summary'
--- bin/pt-mysql-summary	2011-09-01 16:00:38 +0000
+++ bin/pt-mysql-summary	2012-02-01 16:31:24 +0000
@@ -13,6 +13,46 @@
    exit 1
 }
 
+# ###########################################################################
+# tmpdir package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the Bazaar repository at,
+#   lib/bash/tmpdir.sh
+#   t/lib/bash/tmpdir.sh
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+
+set -u
+
+TMPDIR=""
+
+mk_tmpdir() {
+   local dir=${1:-""}
+
+   if [ -n "$dir" ]; then
+      if [ ! -d "$dir" ]; then
+         mkdir $dir || die "Cannot make tmpdir $dir"
+      fi
+      TMPDIR="$dir"
+   else
+      local tool=`basename $0`
+      local pid="$$"
+      TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
+         || die "Cannot make secure tmpdir"
+   fi
+}
+
+rm_tmpdir() {
+   if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then
+      rm -rf $TMPDIR
+   fi
+   TMPDIR=""
+}
+
+# ###########################################################################
+# End tmpdir package
+# ###########################################################################
+
 # ########################################################################
 # Some global setup is necessary for cross-platform compatibility, even
 # when sourcing this script for testing purposes.
@@ -62,9 +102,9 @@
 # symlink them to /etc/passwd and then run this program as root.  Call this
 # function with "rm" or "touch" as an argument.
 temp_files() {
-   for file in /tmp/percona-toolkit{,-mysql-variables,-mysql-status,-innodb-status} \
-         /tmp/percona-toolkit{2,-mysql-databases,-mysql-processlist,-noncounters} \
-         /tmp/percona-toolkit-mysql{dump,-slave};
+   for file in $TMPDIR/percona-toolkit{,-mysql-variables,-mysql-status,-innodb-status} \
+         $TMPDIR/percona-toolkit{2,-mysql-databases,-mysql-processlist,-noncounters} \
+         $TMPDIR/percona-toolkit-mysql{dump,-slave};
    do
       case "$1" in
       touch)
@@ -127,16 +167,16 @@
    }'
 }
 
-# gets a value from /tmp/percona-toolkit-mysql-variables.  Returns zero if it doesn't
+# gets a value from $TMPDIR/percona-toolkit-mysql-variables.  Returns zero if it doesn't
 # exist.
 get_var () {
-   v="$($AP_AWK "\$1 ~ /^$1$/ { print \$2 }" /tmp/percona-toolkit-mysql-variables)"
+   v="$($AP_AWK "\$1 ~ /^$1$/ { print \$2 }" $TMPDIR/percona-toolkit-mysql-variables)"
    echo "${v:-0}"
 }
 
 # Returns true if a variable exists
 var_exists () {
-   $AP_GREP "$1" /tmp/percona-toolkit-mysql-variables >/dev/null 2>&1;
+   $AP_GREP "$1" $TMPDIR/percona-toolkit-mysql-variables >/dev/null 2>&1;
 }
 
 # Returns "Enabled", "Disabled", or "Not Supported" depending on whether the
@@ -145,7 +185,7 @@
 # (string equal) to some value.
 feat_on() {
    if var_exists $1 ; then
-      var="$($AP_AWK "\$1 ~ /^$1$/ { print \$2 }" /tmp/percona-toolkit-mysql-variables)"
+      var="$($AP_AWK "\$1 ~ /^$1$/ { print \$2 }" $TMPDIR/percona-toolkit-mysql-variables)"
       if [ "${var}" = "ON" ]; then
          echo "Enabled"
       elif [ "${var}" = "OFF" -o "${var}" = "0" -o -z "${var}" ]; then
@@ -172,10 +212,10 @@
    fi
 }
 
-# gets a value from /tmp/percona-toolkit-mysql-status.  Returns zero if it doesn't
+# gets a value from $TMPDIR/percona-toolkit-mysql-status.  Returns zero if it doesn't
 # exist.
 get_stat () {
-   v="$($AP_AWK "\$1 ~ /^$1$/ { print \$2 }" /tmp/percona-toolkit-mysql-status)"
+   v="$($AP_AWK "\$1 ~ /^$1$/ { print \$2 }" $TMPDIR/percona-toolkit-mysql-status)"
    echo "${v:-0}"
 }
 
@@ -195,14 +235,17 @@
 # Functions for parsing specific files and getting desired info from them.
 # These are called from within main() and are separated so they can be tested
 # easily.  The calling convention is that the data they need to run is prepared
-# first by putting it into /tmp/percona-toolkit.  Then code that's testing just needs to
-# put sample data into /tmp/percona-toolkit and call it.
+# first by putting it into $TMPDIR/percona-toolkit.  Then code that's testing
+# just needs to put sample data into $TMPDIR/percona-toolkit and call it.
 # ##############################################################################
 
 # Parses the output of 'ps -e -o args | $AP_GREP mysqld' or 'ps auxww...'
-# which should be in /tmp/percona-toolkit.
+# which should be in $TMPDIR/percona-toolkit.
 parse_mysqld_instances () {
    local file=$1
+   local socket=${socket:-""}
+   local port=${port:-""}
+   local datadir=${datadir:-""}
    echo "  Port  Data Directory             Socket"
    echo "  ===== ========================== ======"
    $AP_GREP '/mysqld ' $file | while read line; do
@@ -224,11 +267,11 @@
 }
 
 # Tries to find the my.cnf file by examining 'ps' output, which should be in
-# /tmp/percona-toolkit.  You have to specify the port for the instance you are
+# $TMPDIR/percona-toolkit.  You have to specify the port for the instance you are
 # interested in, in case there are multiple instances.
 find_my_cnf_file() {
    local file=$1
-   local port=$2
+   local port=${2:-""}
    if test -n "$port" && $AP_GREP -- "/mysqld.*--port=$port" $file >/dev/null 2>&1 ; then
       $AP_GREP -- "/mysqld.*--port=$port" $file \
          | $AP_AWK 'BEGIN{RS=" "; FS="=";} $1 ~ /--defaults-file/ { print $2; }' \
@@ -240,7 +283,7 @@
    fi
 }
 
-# Gets the MySQL system time.  Uses input from /tmp/percona-toolkit-mysql-variables.
+# Gets the MySQL system time.  Uses input from $TMPDIR/percona-toolkit-mysql-variables.
 get_mysql_timezone () {
    tz="$(get_var time_zone)"
    if [ "${tz}" = "SYSTEM" ]; then
@@ -249,14 +292,14 @@
    echo "${tz}"
 }
 
-# Gets the MySQL system version.  Uses input from /tmp/percona-toolkit-mysql-variables.
+# Gets the MySQL system version.  Uses input from $TMPDIR/percona-toolkit-mysql-variables.
 get_mysql_version () {
    name_val Version "$(get_var version) $(get_var version_comment)"
    name_val "Built On" "$(get_var version_compile_os) $(get_var version_compile_machine)"
 }
 
 # Gets the system start and uptime in human readable format.  Last restart date
-# should be in /tmp/percona-toolkit.
+# should be in $TMPDIR/percona-toolkit.
 get_mysql_uptime () {
    local file=$1
    restart="$(cat $file)"
@@ -265,7 +308,7 @@
    echo "${restart} (up ${uptime})"
 }
 
-# Summarizes the output of SHOW MASTER LOGS, which is in /tmp/percona-toolkit
+# Summarizes the output of SHOW MASTER LOGS, which is in $TMPDIR/percona-toolkit
 summarize_binlogs () {
    local file=$1
    name_val "Binlogs" $(wc -l $file)
@@ -282,7 +325,7 @@
 }
 
 # Takes as input a file that has two samples of SHOW STATUS, columnized next to
-# each other.  These should be in /tmp/percona-toolkit.  Outputs fuzzy-ed numbers:
+# each other.  These should be in $TMPDIR/percona-toolkit.  Outputs fuzzy-ed numbers:
 # absolute, all-time per second, and per-second over the interval between the
 # samples.  Omits any rows that are all zeroes.
 format_status_variables () {
@@ -387,7 +430,7 @@
    echo
 }
 
-# Pretty-prints the my.cnf file, which should be in /tmp/percona-toolkit.  It's super
+# Pretty-prints the my.cnf file, which should be in $TMPDIR/percona-toolkit.  It's super
 # annoying, but some *modern* versions of awk don't support POSIX character
 # sets in regular expressions, like [[:space:]] (looking at you, Debian).  So
 # the below patterns contain [<space><tab>] and must remain that way.
@@ -545,8 +588,8 @@
    name_val "Pending I/O Writes"  "$(find_pending_io_writes "${file}")"
    name_val "Pending I/O Flushes" "$(find_pending_io_flushes "${file}")"
    $AP_AWK -F, '/^---TRANSACTION/{print $2}' "${file}" \
-      | $AP_SED -e 's/ [0-9]* sec.*//' | sort | uniq -c > /tmp/percona-toolkit2
-   name_val "Transaction States" "$(group_concat /tmp/percona-toolkit2)"
+      | $AP_SED -e 's/ [0-9]* sec.*//' | sort | uniq -c > $TMPDIR/percona-toolkit2
+   name_val "Transaction States" "$(group_concat $TMPDIR/percona-toolkit2)"
    if $AP_GREP 'TABLE LOCK table' "${file}" >/dev/null ; then
       echo "Tables Locked"
       $AP_AWK '/^TABLE LOCK table/{print $4}' "${file}" \
@@ -633,9 +676,9 @@
             printf fmt, db, counts[db ",tables"], counts[db ",views"], counts[db ",sps"], counts[db ",trg"], counts[db ",func"], counts[db ",fk"], counts[db ",partn"];
          }
       }
-   ' $file > /tmp/percona-toolkit
-   head -n2 /tmp/percona-toolkit
-   tail -n +3 /tmp/percona-toolkit | sort
+   ' $file > $TMPDIR/percona-toolkit
+   head -n2 $TMPDIR/percona-toolkit
+   tail -n +3 $TMPDIR/percona-toolkit | sort
 
    echo
    # Now do the summary of engines per DB
@@ -693,9 +736,9 @@
             print "";
          }
       }
-   ' $file > /tmp/percona-toolkit
-   head -n1 /tmp/percona-toolkit
-   tail -n +2 /tmp/percona-toolkit | sort
+   ' $file > $TMPDIR/percona-toolkit
+   head -n1 $TMPDIR/percona-toolkit
+   tail -n +2 $TMPDIR/percona-toolkit | sort
 
    echo
    # Now do the summary of index types per DB. Careful -- index is a reserved
@@ -766,9 +809,9 @@
             print "";
          }
       }
-   ' $file > /tmp/percona-toolkit
-   head -n1 /tmp/percona-toolkit
-   tail -n +2 /tmp/percona-toolkit | sort
+   ' $file > $TMPDIR/percona-toolkit
+   head -n1 $TMPDIR/percona-toolkit
+   tail -n +2 $TMPDIR/percona-toolkit | sort
 
    echo
    # Now do the summary of datatypes per DB
@@ -857,10 +900,10 @@
             print "";
          }
       }
-   ' $file > /tmp/percona-toolkit
-   hdr=$($AP_GREP -n Database /tmp/percona-toolkit | cut -d: -f1);
-   head -n${hdr} /tmp/percona-toolkit
-   tail -n +$((${hdr} + 1)) /tmp/percona-toolkit | sort
+   ' $file > $TMPDIR/percona-toolkit
+   hdr=$($AP_GREP -n Database $TMPDIR/percona-toolkit | cut -d: -f1);
+   head -n${hdr} $TMPDIR/percona-toolkit
+   tail -n +$((${hdr} + 1)) $TMPDIR/percona-toolkit | sort
    echo
 }
 
@@ -878,6 +921,7 @@
    export PATH="/usr/gnu/bin/:/usr/xpg4/bin/:${PATH}"
 
    # Set up temporary files.
+   mk_tmpdir
    temp_files "rm"
    temp_files "touch"
 
@@ -887,25 +931,26 @@
    section Percona_Toolkit_MySQL_Summary_Report
    name_val "System time" "`date -u +'%F %T UTC'` (local TZ: `date +'%Z %z'`)"
    section Instances
-   ps auxww 2>/dev/null | $AP_GREP mysqld > /tmp/percona-toolkit
-   parse_mysqld_instances /tmp/percona-toolkit
+   ps auxww 2>/dev/null | $AP_GREP mysqld > $TMPDIR/percona-toolkit
+   parse_mysqld_instances $TMPDIR/percona-toolkit
 
    # ########################################################################
    # Fetch some basic info so we can start
    # ########################################################################
-   mysql "$@" -ss -e 'SELECT CURRENT_USER()' > /tmp/percona-toolkit
+   mysql "$@" -ss -e 'SELECT CURRENT_USER()' > $TMPDIR/percona-toolkit
    if [ "$?" != "0" ]; then
       echo "Cannot connect to mysql, please specify command-line options."
       temp_files "rm"
+      rm_tmpdir
       exit 1
    fi
-   user="$(cat /tmp/percona-toolkit)";
-   mysql "$@" -ss  -e 'SHOW /*!40100 GLOBAL*/ VARIABLES' > /tmp/percona-toolkit-mysql-variables
-   mysql "$@" -ss  -e 'SHOW /*!50000 GLOBAL*/ STATUS' > /tmp/percona-toolkit-mysql-status
-   mysql "$@" -ss  -e 'SHOW DATABASES' > /tmp/percona-toolkit-mysql-databases 2>/dev/null
-   mysql "$@" -ssE -e 'SHOW SLAVE STATUS' > /tmp/percona-toolkit-mysql-slave 2>/dev/null
-   mysql "$@" -ssE -e 'SHOW /*!50000 ENGINE*/ INNODB STATUS' > /tmp/percona-toolkit-innodb-status 2>/dev/null
-   mysql "$@" -ssE -e 'SHOW FULL PROCESSLIST' > /tmp/percona-toolkit-mysql-processlist 2>/dev/null
+   user="$(cat $TMPDIR/percona-toolkit)";
+   mysql "$@" -ss  -e 'SHOW /*!40100 GLOBAL*/ VARIABLES' > $TMPDIR/percona-toolkit-mysql-variables
+   mysql "$@" -ss  -e 'SHOW /*!50000 GLOBAL*/ STATUS' > $TMPDIR/percona-toolkit-mysql-status
+   mysql "$@" -ss  -e 'SHOW DATABASES' > $TMPDIR/percona-toolkit-mysql-databases 2>/dev/null
+   mysql "$@" -ssE -e 'SHOW SLAVE STATUS' > $TMPDIR/percona-toolkit-mysql-slave 2>/dev/null
+   mysql "$@" -ssE -e 'SHOW /*!50000 ENGINE*/ INNODB STATUS' > $TMPDIR/percona-toolkit-innodb-status 2>/dev/null
+   mysql "$@" -ssE -e 'SHOW FULL PROCESSLIST' > $TMPDIR/percona-toolkit-mysql-processlist 2>/dev/null
    now="$(mysql "$@" -ss -e 'SELECT NOW()')"
    port="$(get_var port)"
 
@@ -920,16 +965,16 @@
 
    uptime="$(get_stat Uptime)"
    mysql "$@" -ss -e "SELECT LEFT(NOW() - INTERVAL ${uptime} SECOND, 16)" \
-      > /tmp/percona-toolkit
-   name_val Started "$(get_mysql_uptime /tmp/percona-toolkit)"
+      > $TMPDIR/percona-toolkit
+   name_val Started "$(get_mysql_uptime $TMPDIR/percona-toolkit)"
 
-   name_val Databases "$($AP_GREP -c . /tmp/percona-toolkit-mysql-databases)"
+   name_val Databases "$($AP_GREP -c . $TMPDIR/percona-toolkit-mysql-databases)"
    name_val Datadir "$(get_var datadir)"
    procs="$(get_stat Threads_connected)"
    procr="$(get_stat Threads_running)"
    name_val Processes "$(fuzz ${procs}) connected, $(fuzz ${procr}) running"
-   if [ -s /tmp/percona-toolkit-mysql-slave ]; then slave=""; else slave="not "; fi
-   slavecount=$($AP_GREP -c 'Binlog Dump' /tmp/percona-toolkit-mysql-processlist)
+   if [ -s $TMPDIR/percona-toolkit-mysql-slave ]; then slave=""; else slave="not "; fi
+   slavecount=$($AP_GREP -c 'Binlog Dump' $TMPDIR/percona-toolkit-mysql-processlist)
    name_val Replication "Is ${slave}a slave, has ${slavecount} slaves connected"
 
    # TODO move this into a section with other files: error log, slow log and
@@ -942,7 +987,7 @@
    # Processlist, sliced several different ways
    # ########################################################################
    section Processlist
-   summarize_processlist /tmp/percona-toolkit-mysql-processlist
+   summarize_processlist $TMPDIR/percona-toolkit-mysql-processlist
 
    # ########################################################################
    # Queries and query plans
@@ -951,7 +996,7 @@
    sleep 10
    # TODO: gather this data in the same format as normal: stats, TS line
    mysql "$@" -ss -e 'SHOW /*!50000 GLOBAL*/ STATUS' \
-      | join /tmp/percona-toolkit-mysql-status - > /tmp/percona-toolkit 
+      | join $TMPDIR/percona-toolkit-mysql-status - > $TMPDIR/percona-toolkit 
    # Make a file with a list of things we want to omit because they aren't
    # counters, they are gauges (in RRDTool terminology).  Gauges are shown
    # elsewhere in the output.
@@ -975,9 +1020,9 @@
       Threads_cached Threads_connected Threads_running \
       Uptime_since_flush_status;
    do
-      echo "${var}" >> /tmp/percona-toolkit-noncounters
+      echo "${var}" >> $TMPDIR/percona-toolkit-noncounters
    done
-   format_status_variables /tmp/percona-toolkit | $AP_GREP -v -f /tmp/percona-toolkit-noncounters
+   format_status_variables $TMPDIR/percona-toolkit | $AP_GREP -v -f $TMPDIR/percona-toolkit-noncounters
 
    # ########################################################################
    # Table cache
@@ -1054,22 +1099,22 @@
          trg_arg="${trg_arg} ${triggers}";
       fi
       # Find out which databases to dump
-      num_dbs="$($AP_GREP -c . /tmp/percona-toolkit-mysql-databases)"
+      num_dbs="$($AP_GREP -c . $TMPDIR/percona-toolkit-mysql-databases)"
       echo "There are ${num_dbs} databases.  Would you like to dump all, or just one?"
       echo -n "Type the name of the database, or press Enter to dump all of them. "
       read dbtodump
       mysqldump "$@" --no-data --skip-comments \
          --skip-add-locks --skip-add-drop-table --compact \
          --skip-lock-all-tables --skip-lock-tables --skip-set-charset \
-         ${trg_arg} ${dbtodump:---all-databases} > /tmp/percona-toolkit-mysqldump
+         ${trg_arg} ${dbtodump:---all-databases} > $TMPDIR/percona-toolkit-mysqldump
       # Test the result by checking the file, not by the exit status, because we
       # might get partway through and then die, and the info is worth analyzing
       # anyway.
-      if $AP_GREP 'CREATE TABLE' /tmp/percona-toolkit-mysqldump >/dev/null 2>&1; then
-         format_overall_db_stats /tmp/percona-toolkit-mysqldump
+      if $AP_GREP 'CREATE TABLE' $TMPDIR/percona-toolkit-mysqldump >/dev/null 2>&1; then
+         format_overall_db_stats $TMPDIR/percona-toolkit-mysqldump
       else
          echo "Skipping schema analysis due to apparent error in dump file"
-         rm -f /tmp/percona-toolkit-mysqldump
+         rm -f $TMPDIR/percona-toolkit-mysqldump
       fi
    else
       echo "Skipping schema analysis"
@@ -1079,23 +1124,23 @@
    # Noteworthy Technologies
    # ########################################################################
    section Noteworthy_Technologies
-   if [ -e /tmp/percona-toolkit-mysqldump ]; then
-      if $AP_GREP FULLTEXT /tmp/percona-toolkit-mysqldump > /dev/null; then
+   if [ -e $TMPDIR/percona-toolkit-mysqldump ]; then
+      if $AP_GREP FULLTEXT $TMPDIR/percona-toolkit-mysqldump > /dev/null; then
          name_val "Full Text Indexing" Yes
       else
          name_val "Full Text Indexing" No
       fi
-      if $AP_GREP 'GEOMETRY\|POINT\|LINESTRING\|POLYGON' /tmp/percona-toolkit-mysqldump > /dev/null; then
+      if $AP_GREP 'GEOMETRY\|POINT\|LINESTRING\|POLYGON' $TMPDIR/percona-toolkit-mysqldump > /dev/null; then
          name_val "Geospatial Types" Yes
       else
          name_val "Geospatial Types" No
       fi
-      if $AP_GREP 'FOREIGN KEY' /tmp/percona-toolkit-mysqldump > /dev/null; then
+      if $AP_GREP 'FOREIGN KEY' $TMPDIR/percona-toolkit-mysqldump > /dev/null; then
          name_val "Foreign Keys" Yes
       else
          name_val "Foreign Keys" No
       fi
-      if $AP_GREP 'PARTITION BY' /tmp/percona-toolkit-mysqldump > /dev/null; then
+      if $AP_GREP 'PARTITION BY' $TMPDIR/percona-toolkit-mysqldump > /dev/null; then
          name_val "Partitioning" Yes
       else
          name_val "Partitioning" No
@@ -1175,8 +1220,8 @@
       name_val "Adaptive Flushing"   $(get_var innodb_adaptive_flushing)
       name_val "Adaptive Checkpoint" $(get_var innodb_adaptive_checkpoint)
 
-      if [ -s /tmp/percona-toolkit-innodb-status ]; then
-         format_innodb_status /tmp/percona-toolkit-innodb-status
+      if [ -s $TMPDIR/percona-toolkit-innodb-status ]; then
+         format_innodb_status $TMPDIR/percona-toolkit-innodb-status
       fi
    fi
 
@@ -1211,15 +1256,15 @@
    section Binary_Logging
    binlog=$(get_var log_bin)
    if [ "${binlog}" ]; then
-      mysql "$@" -ss -e 'SHOW MASTER LOGS' > /tmp/percona-toolkit 2>/dev/null
-      summarize_binlogs /tmp/percona-toolkit
+      mysql "$@" -ss -e 'SHOW MASTER LOGS' > $TMPDIR/percona-toolkit 2>/dev/null
+      summarize_binlogs $TMPDIR/percona-toolkit
       format="$(get_var binlog_format)"
       name_val binlog_format "${format:-STATEMENT}"
       name_val expire_logs_days $(get_var expire_logs_days)
       name_val sync_binlog $(get_var sync_binlog)
       name_val server_id $(get_var server_id)
-      mysql "$@" -ss -e 'SHOW MASTER STATUS' > /tmp/percona-toolkit 2>/dev/null
-      format_binlog_filters /tmp/percona-toolkit
+      mysql "$@" -ss -e 'SHOW MASTER STATUS' > $TMPDIR/percona-toolkit 2>/dev/null
+      format_binlog_filters $TMPDIR/percona-toolkit
    fi
 
 # Replication: seconds behind, running, filters, skip_slave_start, skip_errors,
@@ -1252,8 +1297,8 @@
    # If there is a my.cnf in a standard location, see if we can pretty-print it.
    # ########################################################################
    section Configuration_File
-   ps auxww 2>/dev/null | $AP_GREP mysqld > /tmp/percona-toolkit
-   cnf_file=$(find_my_cnf_file /tmp/percona-toolkit ${port});
+   ps auxww 2>/dev/null | $AP_GREP mysqld > $TMPDIR/percona-toolkit
+   cnf_file=$(find_my_cnf_file $TMPDIR/percona-toolkit ${port});
    if [ ! -e "${cnf_file}" ]; then
       name_val "Config File" "Cannot autodetect, trying common locations"
       cnf_file="/etc/my.cnf";
@@ -1266,13 +1311,14 @@
    fi
    if [ -e "${cnf_file}" ]; then
       name_val "Config File" "${cnf_file}"
-      cat "${cnf_file}" > /tmp/percona-toolkit
-      pretty_print_cnf_file /tmp/percona-toolkit
+      cat "${cnf_file}" > $TMPDIR/percona-toolkit
+      pretty_print_cnf_file $TMPDIR/percona-toolkit
    else
       name_val "Config File" "Cannot autodetect or find, giving up"
    fi
 
    temp_files "rm"
+   rm_tmpdir
 
    # Make sure that we signal the end of the tool's output.
    section The_End
@@ -1325,8 +1371,8 @@
 
 pt-mysql-summary works by connecting to a MySQL database server and querying
 it for status and configuration information.  It saves these bits of data
-into files in /tmp, and then formats them neatly with awk and other scripting
-languages.
+into files in a temporary directory, and then formats them neatly with awk
+and other scripting languages.
 
 To use, simply execute it.  Optionally add the same command-line options
 you would use to connect to MySQL, like  C<pt-mysql-summary --user=foo>.

=== modified file 'bin/pt-sift'
--- bin/pt-sift	2011-09-01 16:00:38 +0000
+++ bin/pt-sift	2012-02-01 16:31:24 +0000
@@ -13,6 +13,47 @@
    exit 1
 }
 
+# ###########################################################################
+# tmpdir package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the Bazaar repository at,
+#   lib/bash/tmpdir.sh
+#   t/lib/bash/tmpdir.sh
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+
+# pt-sift isn't ready for this yet.
+#set -u
+
+TMPDIR=""
+
+mk_tmpdir() {
+   local dir=${1:-""}
+
+   if [ -n "$dir" ]; then
+      if [ ! -d "$dir" ]; then
+         mkdir $dir || die "Cannot make tmpdir $dir"
+      fi
+      TMPDIR="$dir"
+   else
+      local tool=`basename $0`
+      local pid="$$"
+      TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
+         || die "Cannot make secure tmpdir"
+   fi
+}
+
+rm_tmpdir() {
+   if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then
+      rm -rf $TMPDIR
+   fi
+   TMPDIR=""
+}
+
+# ###########################################################################
+# End tmpdir package
+# ###########################################################################
+
 # Show current help and settings
 print_help() {
    cat <<-HELP
@@ -89,19 +130,22 @@
       fi 
    done
 
+   # Make a secure tmpdir.
+   mk_tmpdir
+
    # We need to generate a list of timestamps, and ask the user to choose one if
    # there is no PREFIX yet.  NOTE: we rely on the "-df" files here.
-   ls "${BASEDIR}" | grep -- '-df$' | cut -d- -f1 | sort > /tmp/pt-sift.prefixes
+   ls "${BASEDIR}" | grep -- '-df$' | cut -d- -f1 | sort > $TMPDIR/pt-sift.prefixes
    if [ -z "${PREFIX}" ]; then
-      if [ "$(grep -c . /tmp/pt-sift.prefixes)" = "1" ]; then
+      if [ "$(grep -c . $TMPDIR/pt-sift.prefixes)" = "1" ]; then
          # If there is only one sample, we use it as the prefix.
-         PREFIX="$(cat /tmp/pt-sift.prefixes)"
+         PREFIX="$(cat $TMPDIR/pt-sift.prefixes)"
       fi
    fi
    if [ -z "${PREFIX}" ]; then
       echo
       i=0
-      cat /tmp/pt-sift.prefixes | while read line; do
+      cat $TMPDIR/pt-sift.prefixes | while read line; do
          i=$(($i + 1))
          echo -n "  $line"
          if [ "${i}" = "3" ]; then
@@ -111,14 +155,14 @@
       done
       # We might have ended mid-line or we might have printed a newline; print a
       # newline if required to end the list of timestamp prefixes.
-      awk 'BEGIN { i = 0 } { i++ } END { if ( i % 3 != 0 ) { print "" } }' /tmp/pt-sift.prefixes
+      awk 'BEGIN { i = 0 } { i++ } END { if ( i % 3 != 0 ) { print "" } }' $TMPDIR/pt-sift.prefixes
       echo
-      while [ -z "${PREFIX}" -o "$(grep -c "${PREFIX}" /tmp/pt-sift.prefixes)" -ne 1 ]; do
-         DEFAULT="$(tail -1 /tmp/pt-sift.prefixes)"
+      while [ -z "${PREFIX}" -o "$(grep -c "${PREFIX}" $TMPDIR/pt-sift.prefixes)" -ne 1 ]; do
+         DEFAULT="$(tail -1 $TMPDIR/pt-sift.prefixes)"
          read -e -p "Select a timestamp from the list [${DEFAULT}] " ARG
          ARG="${ARG:-${DEFAULT}}"
-         if [ "$(grep -c "${ARG}" /tmp/pt-sift.prefixes)" -eq 1 ]; then
-            PREFIX="$(grep "${ARG}" /tmp/pt-sift.prefixes)"
+         if [ "$(grep -c "${ARG}" $TMPDIR/pt-sift.prefixes)" -eq 1 ]; then
+            PREFIX="$(grep "${ARG}" $TMPDIR/pt-sift.prefixes)"
          fi
       done
    fi
@@ -130,7 +174,7 @@
       if [ "${ACTION}" != "INVALID" ]; then
          # Print the current host, timestamp and action.  Figure out if we're at
          # the first or last sample, to make it easy to navigate.
-         PAGE="$(awk "/./{i++} /${PREFIX}/{c=i} END{print c, \"of\", i}" /tmp/pt-sift.prefixes)"
+         PAGE="$(awk "/./{i++} /${PREFIX}/{c=i} END{print c, \"of\", i}" $TMPDIR/pt-sift.prefixes)"
          HOST="$(cat "${BASEDIR}/${PREFIX}-hostname" 2>/dev/null)"
          echo -e "======== ${HOST:-unknown} at \033[34m${PREFIX} \033[31m${ACTION}\033[0m (${PAGE}) ========"
       fi
@@ -438,7 +482,7 @@
                   if ( printed == 0 ) {
                      print \"${PREFIX}\";
                   }
-               }" /tmp/pt-sift.prefixes)"
+               }" $TMPDIR/pt-sift.prefixes)"
             ;;
          1)
             ACTION="DEFAULT"
@@ -475,6 +519,7 @@
       esac
    done
 
+   rm_tmpdir
 }
 
 # Execute the program if it was not included from another file.  This makes it

=== modified file 'bin/pt-summary'
--- bin/pt-summary	2011-09-01 16:00:38 +0000
+++ bin/pt-summary	2012-02-01 16:31:24 +0000
@@ -44,13 +44,53 @@
    echo $1 | $AP_AWK "{fuzzy_var=\$1; ${fuzzy_formula} print fuzzy_var;}"
 }
 
+# ###########################################################################
+# tmpdir package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the Bazaar repository at,
+#   lib/bash/tmpdir.sh
+#   t/lib/bash/tmpdir.sh
+# See https://launchpad.net/percona-toolkit for more information.
+# ###########################################################################
+
+set -u
+
+TMPDIR=""
+
+mk_tmpdir() {
+   local dir=${1:-""}
+
+   if [ -n "$dir" ]; then
+      if [ ! -d "$dir" ]; then
+         mkdir $dir || die "Cannot make tmpdir $dir"
+      fi
+      TMPDIR="$dir"
+   else
+      local tool=`basename $0`
+      local pid="$$"
+      TMPDIR=`mktemp -d /tmp/${tool}.${pid}.XXXXX` \
+         || die "Cannot make secure tmpdir"
+   fi
+}
+
+rm_tmpdir() {
+   if [ -n "$TMPDIR" ] && [ -d "$TMPDIR" ]; then
+      rm -rf $TMPDIR
+   fi
+   TMPDIR=""
+}
+
+# ###########################################################################
+# End tmpdir package
+# ###########################################################################
+
 # The temp files are for storing working results so we don't call commands many
 # times (gives inconsistent results, maybe adds load on things I don't want to
 # such as RAID controllers).  They must not exist -- if they did, someone would
 # symlink them to /etc/passwd and then run this program as root.  Call this
 # function with "rm" or "touch" as an argument.
 temp_files() {
-   for file in /tmp/percona-toolkit /tmp/percona-toolkit2; do
+   for file in $TMPDIR/percona-toolkit $TMPDIR/percona-toolkit2; do
       case "$1" in
       touch)
          if ! touch "${file}"; then
@@ -128,12 +168,12 @@
 # Functions for parsing specific files and getting desired info from them.
 # These are called from within main() and are separated so they can be tested
 # easily.  The calling convention is that the data they need to run is prepared
-# first by putting it into /tmp/percona-toolkit.  Then code that's testing just needs to
-# put sample data into /tmp/percona-toolkit and call it.
+# first by putting it into $TMPDIR/percona-toolkit.  Then code that's testing
+# just needs to put sample data into $TMPDIR/percona-toolkit and call it.
 # ##############################################################################
    
 # ##############################################################################
-# Parse Linux's /proc/cpuinfo, which should be stored in /tmp/percona-toolkit.
+# Parse Linux's /proc/cpuinfo, which should be stored in $TMPDIR/percona-toolkit.
 # ##############################################################################
 parse_proc_cpuinfo () {
    local file=$1
@@ -189,8 +229,8 @@
       start = index($0, " at ") + 4;
       end   = length($0) - start - 4
       print substr($0, start, end);
-   }' "$1" | sort | uniq -c > /tmp/percona-toolkit2
-   name_val "Speeds" "$(group_concat /tmp/percona-toolkit2)"
+   }' "$1" | sort | uniq -c > $TMPDIR/percona-toolkit2
+   name_val "Speeds" "$(group_concat $TMPDIR/percona-toolkit2)"
 }
 
 # ##############################################################################
@@ -292,7 +332,7 @@
 }
 
 # ##############################################################################
-# Parse the output of 'netstat -antp' which should be in /tmp/percona-toolkit.
+# Parse the output of 'netstat -antp' which should be in $TMPDIR/percona-toolkit.
 # ##############################################################################
 parse_netstat () {
    local file=$1
@@ -397,7 +437,7 @@
 }
 
 # ##############################################################################
-# Parse the output of fdisk -l, which should be in /tmp/percona-toolkit; there might be
+# Parse the output of fdisk -l, which should be in $TMPDIR/percona-toolkit; there might be
 # multiple fdisk -l outputs in the file.
 # ##############################################################################
 parse_fdisk () {
@@ -431,7 +471,7 @@
 }
 
 # ##############################################################################
-# Parse the output of dmesg, which should be in /tmp/percona-toolkit, and detect
+# Parse the output of dmesg, which should be in $TMPDIR/percona-toolkit, and detect
 # virtualization.
 # ##############################################################################
 parse_virtualization_dmesg () {
@@ -463,7 +503,7 @@
 }
 
 # ##############################################################################
-# Parse the output of lspci, which should be in /tmp/percona-toolkit, and detect
+# Parse the output of lspci, which should be in $TMPDIR/percona-toolkit, and detect
 # Ethernet cards.
 # ##############################################################################
 parse_ethernet_controller_lspci () {
@@ -474,7 +514,7 @@
 }
 
 # ##############################################################################
-# Parse the output of lspci, which should be in /tmp/percona-toolkit, and detect RAID
+# Parse the output of lspci, which should be in $TMPDIR/percona-toolkit, and detect RAID
 # controllers.
 # ##############################################################################
 parse_raid_controller_lspci () {
@@ -497,7 +537,7 @@
 }
 
 # ##############################################################################
-# Parse the output of dmesg, which should be in /tmp/percona-toolkit, and detect RAID
+# Parse the output of dmesg, which should be in $TMPDIR/percona-toolkit, and detect RAID
 # controllers.
 # ##############################################################################
 parse_raid_controller_dmesg () {
@@ -516,7 +556,7 @@
 
 # ##############################################################################
 # Parse the output of "hpacucli ctrl all show config", which should be stored in
-# /tmp/percona-toolkit
+# $TMPDIR/percona-toolkit
 # ##############################################################################
 parse_hpacucli () {
    local file=$1
@@ -524,7 +564,7 @@
 }
 
 # ##############################################################################
-# Parse the output of arcconf, which should be stored in /tmp/percona-toolkit
+# Parse the output of arcconf, which should be stored in $TMPDIR/percona-toolkit
 # ##############################################################################
 parse_arcconf () {
    local file=$1
@@ -634,7 +674,7 @@
 }
 
 # ##############################################################################
-# Parse the output of MegaCli64 -AdpAllInfo -aALL from /tmp/percona-toolkit.
+# Parse the output of MegaCli64 -AdpAllInfo -aALL from $TMPDIR/percona-toolkit.
 # ##############################################################################
 parse_lsi_megaraid_adapter_info () {
    local file=$1
@@ -653,7 +693,7 @@
 }
 
 # ##############################################################################
-# Parse the output (saved in /tmp/percona-toolkit) of
+# Parse the output (saved in $TMPDIR/percona-toolkit) of
 # /opt/MegaRAID/MegaCli/MegaCli64 -AdpBbuCmd -GetBbuStatus -aALL
 # ##############################################################################
 parse_lsi_megaraid_bbu_status () {
@@ -665,7 +705,7 @@
 }
 
 # ##############################################################################
-# Parse physical devices from the output (saved in /tmp/percona-toolkit) of
+# Parse physical devices from the output (saved in $TMPDIR/percona-toolkit) of
 # /opt/MegaRAID/MegaCli/MegaCli64 -LdPdInfo -aALL
 # OR, it will also work with the output of
 # /opt/MegaRAID/MegaCli/MegaCli64 -PDList -aALL
@@ -694,7 +734,7 @@
 }
 
 # ##############################################################################
-# Parse virtual devices from the output (saved in /tmp/percona-toolkit) of
+# Parse virtual devices from the output (saved in $TMPDIR/percona-toolkit) of
 # /opt/MegaRAID/MegaCli/MegaCli64 -LdPdInfo -aALL
 # OR, it will also work with the output of
 # /opt/MegaRAID/MegaCli/MegaCli64 -LDInfo -Lall -aAll
@@ -826,6 +866,7 @@
    export PATH="${PATH}:/usr/StorMan/:/opt/MegaRAID/MegaCli/";
 
    # Set up temporary files.
+   mk_tmpdir
    temp_files "rm"
    temp_files "touch"
    section Percona_Toolkit_System_Summary_Report
@@ -833,7 +874,7 @@
    # ########################################################################
    # Grab a bunch of stuff and put it into temp files for later.
    # ########################################################################
-   sysctl -a > /tmp/percona-toolkit.sysctl 2>/dev/null
+   sysctl -a > $TMPDIR/percona-toolkit.sysctl 2>/dev/null
 
    # ########################################################################
    # General date, time, load, etc
@@ -939,19 +980,19 @@
    # available to non-root users and usually has telltale signs.  It's most
    # reliable to look at /var/log/dmesg if possible.  There are a number of
    # other ways to find out if a system is virtualized.
-   cat /var/log/dmesg > /tmp/percona-toolkit 2>/dev/null
-   if [ ! -s /tmp/percona-toolkit ]; then
-      dmesg > /tmp/percona-toolkit 2>/dev/null
+   cat /var/log/dmesg > $TMPDIR/percona-toolkit 2>/dev/null
+   if [ ! -s $TMPDIR/percona-toolkit ]; then
+      dmesg > $TMPDIR/percona-toolkit 2>/dev/null
    fi
-   if [ -s /tmp/percona-toolkit ]; then
-      virt="$(parse_virtualization_dmesg /tmp/percona-toolkit)"
+   if [ -s $TMPDIR/percona-toolkit ]; then
+      virt="$(parse_virtualization_dmesg $TMPDIR/percona-toolkit)"
    fi
    if [ -z "${virt}" ]; then
       if which lspci >/dev/null 2>&1; then
-         lspci > /tmp/percona-toolkit 2>/dev/null
-         if grep -qi virtualbox /tmp/percona-toolkit; then
+         lspci > $TMPDIR/percona-toolkit 2>/dev/null
+         if grep -qi virtualbox $TMPDIR/percona-toolkit; then
             virt=VirtualBox
-         elif grep -qi vmware /tmp/percona-toolkit; then
+         elif grep -qi vmware $TMPDIR/percona-toolkit; then
             virt=VMWare
          elif [ -e /proc/user_beancounters ]; then
             virt="OpenVZ/Virtuozzo"
@@ -962,10 +1003,10 @@
          virt="FreeBSD Jail"
       fi
    elif [ "${platform}" = "SunOS" ]; then
-      if which prtdiag >/dev/null 2>&1 && prtdiag > /tmp/percona-toolkit.prtdiag 2>/dev/null; then
-         virt="$(parse_virtualization_generic /tmp/percona-toolkit.prtdiag)"
-      elif which smbios >/dev/null 2>&1 && smbios > /tmp/percona-toolkit.smbios 2>/dev/null; then
-         virt="$(parse_virtualization_generic /tmp/percona-toolkit.smbios)"
+      if which prtdiag >/dev/null 2>&1 && prtdiag > $TMPDIR/percona-toolkit.prtdiag 2>/dev/null; then
+         virt="$(parse_virtualization_generic $TMPDIR/percona-toolkit.prtdiag)"
+      elif which smbios >/dev/null 2>&1 && smbios > $TMPDIR/percona-toolkit.smbios 2>/dev/null; then
+         virt="$(parse_virtualization_generic $TMPDIR/percona-toolkit.smbios)"
       fi
    fi
    name_val Virtualized "${virt:-No virtualization detected}"
@@ -975,23 +1016,23 @@
    # ########################################################################
    section Processor
    if [ -f /proc/cpuinfo ]; then
-      cat /proc/cpuinfo > /tmp/percona-toolkit 2>/dev/null
-      parse_proc_cpuinfo /tmp/percona-toolkit
+      cat /proc/cpuinfo > $TMPDIR/percona-toolkit 2>/dev/null
+      parse_proc_cpuinfo $TMPDIR/percona-toolkit
    elif [ "${platform}" = "FreeBSD" ]; then
-      parse_sysctl_cpu_freebsd /tmp/percona-toolkit.sysctl
+      parse_sysctl_cpu_freebsd $TMPDIR/percona-toolkit.sysctl
    elif [ "${platform}" = "SunOS" ]; then
-      psrinfo -v > /tmp/percona-toolkit
-      parse_psrinfo_cpus /tmp/percona-toolkit
+      psrinfo -v > $TMPDIR/percona-toolkit
+      parse_psrinfo_cpus $TMPDIR/percona-toolkit
       # TODO: prtconf -v actually prints the CPU model name etc.
    fi
 
    section Memory
    if [ "${platform}" = "Linux" ]; then
-      free -b > /tmp/percona-toolkit
-      cat /proc/meminfo >> /tmp/percona-toolkit
-      parse_free_minus_b /tmp/percona-toolkit
+      free -b > $TMPDIR/percona-toolkit
+      cat /proc/meminfo >> $TMPDIR/percona-toolkit
+      parse_free_minus_b $TMPDIR/percona-toolkit
    elif [ "${platform}" = "FreeBSD" ]; then
-      parse_memory_sysctl_freebsd /tmp/percona-toolkit.sysctl
+      parse_memory_sysctl_freebsd $TMPDIR/percona-toolkit.sysctl
    elif [ "${platform}" = "SunOS" ]; then
       name_val Memory "$(prtconf | awk -F: '/Memory/{print $2}')"
    fi
@@ -1007,8 +1048,8 @@
       fi
    fi
 
-   if which dmidecode >/dev/null 2>&1 && dmidecode > /tmp/percona-toolkit 2>/dev/null; then
-      parse_dmidecode_mem_devices /tmp/percona-toolkit
+   if which dmidecode >/dev/null 2>&1 && dmidecode > $TMPDIR/percona-toolkit 2>/dev/null; then
+      parse_dmidecode_mem_devices $TMPDIR/percona-toolkit
    fi
 
    # ########################################################################
@@ -1023,25 +1064,25 @@
          if [ "${platform}" = "Linux" ]; then
             cmd="df -h -P"
          fi
-         $cmd | sort > /tmp/percona-toolkit2
-         mount | sort | join /tmp/percona-toolkit2 - > /tmp/percona-toolkit
-         parse_filesystems /tmp/percona-toolkit "${platform}"
+         $cmd | sort > $TMPDIR/percona-toolkit2
+         mount | sort | join $TMPDIR/percona-toolkit2 - > $TMPDIR/percona-toolkit
+         parse_filesystems $TMPDIR/percona-toolkit "${platform}"
       fi
    fi
 
    if [ "${platform}" = "Linux" ]; then
       section "Disk_Schedulers_And_Queue_Size"
-      echo "" > /tmp/percona-toolkit
+      echo "" > $TMPDIR/percona-toolkit
       for disk in $(ls /sys/block/ | grep -v -e ram -e loop -e 'fd[0-9]'); do
          if [ -e "/sys/block/${disk}/queue/scheduler" ]; then
             name_val "${disk}" "$(cat /sys/block/${disk}/queue/scheduler | grep -o '\[.*\]') $(cat /sys/block/${disk}/queue/nr_requests)"
-            fdisk -l "/dev/${disk}" >> /tmp/percona-toolkit 2>/dev/null
+            fdisk -l "/dev/${disk}" >> $TMPDIR/percona-toolkit 2>/dev/null
          fi
       done
 
-      # Relies on /tmp/percona-toolkit having data from the Disk Schedulers loop.
+      # Relies on $TMPDIR/percona-toolkit having data from the Disk Schedulers loop.
       section "Disk_Partioning"
-      parse_fdisk /tmp/percona-toolkit
+      parse_fdisk $TMPDIR/percona-toolkit
 
       section "Kernel_Inode_State"
       for file in dentry-state file-nr inode-nr; do
@@ -1064,15 +1105,15 @@
    # often available to non-root users.  It's most reliable to look at
    # /var/log/dmesg if possible.
    # ########################################################################
-   if which lspci >/dev/null 2>&1 && lspci > /tmp/percona-toolkit 2>/dev/null; then
-      controller="$(parse_raid_controller_lspci /tmp/percona-toolkit)"
+   if which lspci >/dev/null 2>&1 && lspci > $TMPDIR/percona-toolkit 2>/dev/null; then
+      controller="$(parse_raid_controller_lspci $TMPDIR/percona-toolkit)"
    fi
    if [ -z "${controller}" ]; then
-      cat /var/log/dmesg > /tmp/percona-toolkit 2>/dev/null
-      if [ ! -s /tmp/percona-toolkit ]; then
-         dmesg > /tmp/percona-toolkit 2>/dev/null
+      cat /var/log/dmesg > $TMPDIR/percona-toolkit 2>/dev/null
+      if [ ! -s $TMPDIR/percona-toolkit ]; then
+         dmesg > $TMPDIR/percona-toolkit 2>/dev/null
       fi
-      controller="$(parse_raid_controller_dmesg /tmp/percona-toolkit)"
+      controller="$(parse_raid_controller_dmesg $TMPDIR/percona-toolkit)"
    fi
 
    name_val Controller "${controller:-No RAID controller detected}"
@@ -1085,29 +1126,29 @@
    # ########################################################################
    notfound=""
    if [ "${controller}" = "AACRAID" ]; then
-      if arcconf getconfig 1 > /tmp/percona-toolkit 2>/dev/null; then
-         parse_arcconf /tmp/percona-toolkit
+      if arcconf getconfig 1 > $TMPDIR/percona-toolkit 2>/dev/null; then
+         parse_arcconf $TMPDIR/percona-toolkit
       elif ! which arcconf >/dev/null 2>&1; then
          notfound="e.g. http://www.adaptec.com/en-US/support/raid/scsi_raid/ASR-2120S/"
       fi
    elif [ "${controller}" = "HP Smart Array" ]; then
-      if hpacucli ctrl all show config > /tmp/percona-toolkit 2>/dev/null; then
-         parse_hpacucli /tmp/percona-toolkit
+      if hpacucli ctrl all show config > $TMPDIR/percona-toolkit 2>/dev/null; then
+         parse_hpacucli $TMPDIR/percona-toolkit
       elif ! which hpacucli >/dev/null 2>&1; then
          notfound="your package repository or the manufacturer's website"
       fi
    elif [ "${controller}" = "LSI Logic MegaRAID SAS" ]; then
-      if MegaCli64 -AdpAllInfo -aALL -NoLog > /tmp/percona-toolkit 2>/dev/null; then
-         parse_lsi_megaraid_adapter_info /tmp/percona-toolkit
+      if MegaCli64 -AdpAllInfo -aALL -NoLog > $TMPDIR/percona-toolkit 2>/dev/null; then
+         parse_lsi_megaraid_adapter_info $TMPDIR/percona-toolkit
       elif ! which MegaCli64 >/dev/null 2>&1; then
          notfound="your package repository or the manufacturer's website"
       fi
-      if MegaCli64 -AdpBbuCmd -GetBbuStatus -aALL -NoLog > /tmp/percona-toolkit 2>/dev/null; then
-         parse_lsi_megaraid_bbu_status /tmp/percona-toolkit
+      if MegaCli64 -AdpBbuCmd -GetBbuStatus -aALL -NoLog > $TMPDIR/percona-toolkit 2>/dev/null; then
+         parse_lsi_megaraid_bbu_status $TMPDIR/percona-toolkit
       fi
-      if MegaCli64 -LdPdInfo -aALL -NoLog > /tmp/percona-toolkit 2>/dev/null; then
-         parse_lsi_megaraid_virtual_devices /tmp/percona-toolkit
-         parse_lsi_megaraid_devices /tmp/percona-toolkit
+      if MegaCli64 -LdPdInfo -aALL -NoLog > $TMPDIR/percona-toolkit 2>/dev/null; then
+         parse_lsi_megaraid_virtual_devices $TMPDIR/percona-toolkit
+         parse_lsi_megaraid_devices $TMPDIR/percona-toolkit
       fi
    fi
 
@@ -1122,8 +1163,8 @@
       # #####################################################################
       if [ "${platform}" = "Linux" ]; then
          section Network_Config
-         if which lspci > /dev/null 2>&1 && lspci > /tmp/percona-toolkit 2>/dev/null; then
-            parse_ethernet_controller_lspci /tmp/percona-toolkit
+         if which lspci > /dev/null 2>&1 && lspci > $TMPDIR/percona-toolkit 2>/dev/null; then
+            parse_ethernet_controller_lspci $TMPDIR/percona-toolkit
          fi
          if sysctl net.ipv4.tcp_fin_timeout > /dev/null 2>&1; then
             name_val "FIN Timeout" "$(sysctl net.ipv4.tcp_fin_timeout)"
@@ -1135,15 +1176,15 @@
       # /proc/sys/net/netfilter/nf_conntrack_max or /proc/sys/net/nf_conntrack_max
       # in new kernels like Fedora 12?
 
-      if which ip >/dev/null 2>&1 && ip -s link > /tmp/percona-toolkit 2>/dev/null; then
+      if which ip >/dev/null 2>&1 && ip -s link > $TMPDIR/percona-toolkit 2>/dev/null; then
          section Interface_Statistics
-         parse_ip_s_link /tmp/percona-toolkit
+         parse_ip_s_link $TMPDIR/percona-toolkit
       fi
 
       if [ "${platform}" = "Linux" ]; then
          section Network_Connections
-         if netstat -antp > /tmp/percona-toolkit 2>/dev/null; then
-            parse_netstat /tmp/percona-toolkit
+         if netstat -antp > $TMPDIR/percona-toolkit 2>/dev/null; then
+            parse_netstat $TMPDIR/percona-toolkit
          fi
       fi
    fi
@@ -1164,12 +1205,12 @@
       fi
       if which vmstat > /dev/null 2>&1 ; then
          section "Simplified_and_fuzzy_rounded_vmstat_(wait_please)"
-         vmstat 1 5 > /tmp/percona-toolkit
+         vmstat 1 5 > $TMPDIR/percona-toolkit
          if [ "${platform}" = "Linux" ]; then
-            format_vmstat /tmp/percona-toolkit
+            format_vmstat $TMPDIR/percona-toolkit
          else
             # TODO: simplify/format for other platforms
-            cat /tmp/percona-toolkit
+            cat $TMPDIR/percona-toolkit
          fi
       fi
    fi
@@ -1179,6 +1220,7 @@
    # ########################################################################
    temp_files "rm"
    temp_files "check"
+   rm_tmpdir
    section The_End
 }
 
@@ -1238,9 +1280,9 @@
 =head1 DESCRIPTION
 
 pt-summary runs a large variety of commands to inspect system status and
-configuration, saves the output into files in /tmp, and then runs Unix
-commands on these results to format them nicely.  It works best when
-executed as a privileged user, but will also work without privileges,
+configuration, saves the output into files in a temporary directory, and
+then runs Unix commands on these results to format them nicely.  It works
+best when executed as a privileged user, but will also work without privileges,
 although some output might not be possible to generate without root.
 
 =head1 OPTIONS

=== modified file 't/pt-mysql-summary/get_mysql_info.sh'
--- t/pt-mysql-summary/get_mysql_info.sh	2011-08-18 17:46:13 +0000
+++ t/pt-mysql-summary/get_mysql_info.sh	2012-02-01 16:31:24 +0000
@@ -3,14 +3,14 @@
 TESTS=3
 
 TEST_NAME="get_mysql_timezone"
-cp samples/mysql-variables-001.txt /tmp/percona-toolkit-mysql-variables
+cp samples/mysql-variables-001.txt $TMPDIR/percona-toolkit-mysql-variables
 is $(get_mysql_timezone) "EDT"
 
 TEST_NAME="get_mysql_uptime"
 cat <<EOF > $TMPDIR/expected
 2010-05-27 11:38 (up 0+02:08:52)
 EOF
-cp samples/mysql-status-001.txt /tmp/percona-toolkit-mysql-status
+cp samples/mysql-status-001.txt $TMPDIR/percona-toolkit-mysql-status
 echo "2010-05-27 11:38" > $TMPDIR/in
 get_mysql_uptime $TMPDIR/in > $TMPDIR/got
 no_diff $TMPDIR/got $TMPDIR/expected
@@ -20,6 +20,6 @@
              Version | 5.0.51a-24+lenny2 (Debian)
             Built On | debian-linux-gnu i486
 EOF
-cp samples/mysql-variables-001.txt /tmp/percona-toolkit-mysql-variables
+cp samples/mysql-variables-001.txt $TMPDIR/percona-toolkit-mysql-variables
 get_mysql_version > $TMPDIR/got
 no_diff $TMPDIR/got $TMPDIR/expected

=== modified file 'util/test-bash-functions'
--- util/test-bash-functions	2011-12-06 20:23:47 +0000
+++ util/test-bash-functions	2012-02-01 16:31:24 +0000
@@ -93,7 +93,7 @@
 # Print a TAP-style test result.
 result() {
    local result=$1
-   local test_name=$2
+   local test_name=${2:-""}
    if [ $result -eq 0 ]; then
       echo "ok $testno - $TEST_FILE $test_name"
    else
@@ -115,7 +115,7 @@
 no_diff() {
    local got=$1
    local expected=$2
-   local test_name=$3
+   local test_name=${3:-""}
    test_command="diff $got $expected"
    eval $test_command > $TEST_TMPDIR/failed_result 2>&1
    result $? "$test_name"
@@ -124,7 +124,7 @@
 is() {
    local got=$1
    local expected=$2
-   local test_name=$3
+   local test_name=${3:-""}
    test_command="\"$got\" == \"$expected\""
    test "$got" = "$expected"
    result $? "$test_name"
@@ -132,7 +132,7 @@
 
 cmd_ok() {
    local test_command=$1
-   local test_name=$2
+   local test_name=${2:-""}
    eval $test_command
    result $? "$test_name"
 }