From 7f9f84a6d0a2cd750b26733cfb1d7d20bcb7a1b3 Mon Sep 17 00:00:00 2001
From: "Brian Fraser fraserb@gmail.com" <>
Date: Mon, 13 Aug 2012 12:23:18 -0300
Subject: [PATCH] shell tools: Quote the arguments to tr

---
 bin/pt-ioprofile          |  8 ++++----
 bin/pt-mysql-summary      |  8 ++++----
 bin/pt-stalk              | 12 ++++++------
 bin/pt-summary            |  8 ++++----
 lib/bash/log_warn_die.sh  |  2 +-
 lib/bash/parse_options.sh |  6 +++---
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/bin/pt-ioprofile b/bin/pt-ioprofile
index 28463753..41f22992 100755
--- a/bin/pt-ioprofile
+++ b/bin/pt-ioprofile
@@ -21,7 +21,7 @@ PTDEBUG="${PTDEBUG:-""}"
 EXIT_STATUS=0
 
 log() {
-   TS=$(date +%F-%T | tr :- _);
+   TS=$(date +%F-%T | tr ':-' '_');
    echo "$TS $*"
 }
 
@@ -120,7 +120,7 @@ usage_or_errors() {
       echo "Options and values after processing arguments:"
       echo
       for opt in $(ls "$PO_DIR"); do
-         local varname="OPT_$(echo "$opt" | tr a-z- A-Z_)"
+         local varname="OPT_$(echo "$opt" | tr 'a-z-' 'A-Z_')"
          local varvalue="${!varname}"
          if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then
             if [ "$varvalue" -a "$varvalue" = "yes" ];
@@ -238,7 +238,7 @@ _eval_po() {
       while read key val; do
          case "$key" in
             long)
-               opt=$(echo $val | sed 's/-/_/g' | tr [:lower:] [:upper:])
+               opt=$(echo $val | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
                ;;
             default)
                default_val="$val"
@@ -404,7 +404,7 @@ _parse_command_line() {
       fi
 
       if [ "$opt_is_ok" ]; then
-         opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr [:lower:] [:upper:])
+         opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
 
          if grep "^type:size" "$spec" >/dev/null; then
             val=$(size_to_bytes $val)
diff --git a/bin/pt-mysql-summary b/bin/pt-mysql-summary
index 3759e31a..2efb34dc 100755
--- a/bin/pt-mysql-summary
+++ b/bin/pt-mysql-summary
@@ -23,7 +23,7 @@ PTDEBUG="${PTDEBUG:-""}"
 EXIT_STATUS=0
 
 log() {
-   TS=$(date +%F-%T | tr :- _);
+   TS=$(date +%F-%T | tr ':-' '_');
    echo "$TS $*"
 }
 
@@ -122,7 +122,7 @@ usage_or_errors() {
       echo "Options and values after processing arguments:"
       echo
       for opt in $(ls "$PO_DIR"); do
-         local varname="OPT_$(echo "$opt" | tr a-z- A-Z_)"
+         local varname="OPT_$(echo "$opt" | tr 'a-z-' 'A-Z_')"
          local varvalue="${!varname}"
          if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then
             if [ "$varvalue" -a "$varvalue" = "yes" ];
@@ -240,7 +240,7 @@ _eval_po() {
       while read key val; do
          case "$key" in
             long)
-               opt=$(echo $val | sed 's/-/_/g' | tr [:lower:] [:upper:])
+               opt=$(echo $val | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
                ;;
             default)
                default_val="$val"
@@ -406,7 +406,7 @@ _parse_command_line() {
       fi
 
       if [ "$opt_is_ok" ]; then
-         opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr [:lower:] [:upper:])
+         opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
 
          if grep "^type:size" "$spec" >/dev/null; then
             val=$(size_to_bytes $val)
diff --git a/bin/pt-stalk b/bin/pt-stalk
index e332a916..169cc9b1 100755
--- a/bin/pt-stalk
+++ b/bin/pt-stalk
@@ -23,7 +23,7 @@ PTDEBUG="${PTDEBUG:-""}"
 EXIT_STATUS=0
 
 log() {
-   TS=$(date +%F-%T | tr :- _);
+   TS=$(date +%F-%T | tr ':-' '_');
    echo "$TS $*"
 }
 
@@ -122,7 +122,7 @@ usage_or_errors() {
       echo "Options and values after processing arguments:"
       echo
       for opt in $(ls "$PO_DIR"); do
-         local varname="OPT_$(echo "$opt" | tr a-z- A-Z_)"
+         local varname="OPT_$(echo "$opt" | tr 'a-z-' 'A-Z_')"
          local varvalue="${!varname}"
          if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then
             if [ "$varvalue" -a "$varvalue" = "yes" ];
@@ -240,7 +240,7 @@ _eval_po() {
       while read key val; do
          case "$key" in
             long)
-               opt=$(echo $val | sed 's/-/_/g' | tr [:lower:] [:upper:])
+               opt=$(echo $val | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
                ;;
             default)
                default_val="$val"
@@ -406,7 +406,7 @@ _parse_command_line() {
       fi
 
       if [ "$opt_is_ok" ]; then
-         opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr [:lower:] [:upper:])
+         opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
 
          if grep "^type:size" "$spec" >/dev/null; then
             val=$(size_to_bytes $val)
@@ -976,7 +976,7 @@ set_trg_func() {
       return 0  # success
    else
       # Trigger function is name of a built-in function.
-      func=$(echo "$func" | tr [:upper:] [:lower:])
+      func=$(echo "$func" | tr '[:upper:]' '[:lower:]')
       if [ "$func" = "status" -o "$func" = "processlist" ]; then
          TRIGGER_FUNCTION="trg_$func"
          return 0  # success
@@ -1103,7 +1103,7 @@ stalk() {
          fi
 
          if [ "$OPT_COLLECT" ]; then
-            local prefix="${OPT_PREFIX:-$(date +%F-%T | tr :- _)}"
+            local prefix="${OPT_PREFIX:-$(date +%F-%T | tr ':-' '_')}"
 
             # Check if we'll have enough disk space to collect.  Disk space
             # is also checked every interval while collecting.
diff --git a/bin/pt-summary b/bin/pt-summary
index 68662a0c..84e09a62 100755
--- a/bin/pt-summary
+++ b/bin/pt-summary
@@ -30,7 +30,7 @@ PTDEBUG="${PTDEBUG:-""}"
 EXIT_STATUS=0
 
 log() {
-   TS=$(date +%F-%T | tr :- _);
+   TS=$(date +%F-%T | tr ':-' '_');
    echo "$TS $*"
 }
 
@@ -129,7 +129,7 @@ usage_or_errors() {
       echo "Options and values after processing arguments:"
       echo
       for opt in $(ls "$PO_DIR"); do
-         local varname="OPT_$(echo "$opt" | tr a-z- A-Z_)"
+         local varname="OPT_$(echo "$opt" | tr 'a-z-' 'A-Z_')"
          local varvalue="${!varname}"
          if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then
             if [ "$varvalue" -a "$varvalue" = "yes" ];
@@ -247,7 +247,7 @@ _eval_po() {
       while read key val; do
          case "$key" in
             long)
-               opt=$(echo $val | sed 's/-/_/g' | tr [:lower:] [:upper:])
+               opt=$(echo $val | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
                ;;
             default)
                default_val="$val"
@@ -413,7 +413,7 @@ _parse_command_line() {
       fi
 
       if [ "$opt_is_ok" ]; then
-         opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr [:lower:] [:upper:])
+         opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
 
          if grep "^type:size" "$spec" >/dev/null; then
             val=$(size_to_bytes $val)
diff --git a/lib/bash/log_warn_die.sh b/lib/bash/log_warn_die.sh
index 2a6e61a0..aa07e31e 100644
--- a/lib/bash/log_warn_die.sh
+++ b/lib/bash/log_warn_die.sh
@@ -29,7 +29,7 @@ PTDEBUG="${PTDEBUG:-""}"
 EXIT_STATUS=0
 
 log() {
-   TS=$(date +%F-%T | tr :- _);
+   TS=$(date +%F-%T | tr ':-' '_');
    echo "$TS $*"
 }
 
diff --git a/lib/bash/parse_options.sh b/lib/bash/parse_options.sh
index 5ae56fc7..6d9a1f0a 100644
--- a/lib/bash/parse_options.sh
+++ b/lib/bash/parse_options.sh
@@ -119,7 +119,7 @@ usage_or_errors() {
       echo "Options and values after processing arguments:"
       echo
       for opt in $(ls "$PO_DIR"); do
-         local varname="OPT_$(echo "$opt" | tr a-z- A-Z_)"
+         local varname="OPT_$(echo "$opt" | tr 'a-z-' 'A-Z_')"
          local varvalue="${!varname}"
          if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then
             # Typeless option, like --version, so it's given/TRUE
@@ -271,7 +271,7 @@ _eval_po() {
       while read key val; do
          case "$key" in
             long)
-               opt=$(echo $val | sed 's/-/_/g' | tr [:lower:] [:upper:])
+               opt=$(echo $val | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
                ;;
             default)
                default_val="$val"
@@ -482,7 +482,7 @@ _parse_command_line() {
 
       if [ "$opt_is_ok" ]; then
          # Get and transform the opt's long form.  E.g.: -q == --quiet == QUIET.
-         opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr [:lower:] [:upper:])
+         opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
 
          # Convert sizes.
          if grep "^type:size" "$spec" >/dev/null; then