percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-13 22:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

shell tools: Quote the arguments to tr

Browse Source
This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-08-13 12:23:18 -03:00
parent 217a45df6f
commit 7f9f84a6d0
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/pt-ioprofile
View File

@@ -21,7 +21,7 @@ PTDEBUG="${PTDEBUG:-""}"
EXIT_STATUS=0 EXIT_STATUS=0
log() { log() {
TS=$(date +%F-%T | tr :- _); TS=$(date +%F-%T | tr ':-' '_');
echo "$TS $*" echo "$TS $*"
} }
@@ -120,7 +120,7 @@ usage_or_errors() {
echo "Options and values after processing arguments:" echo "Options and values after processing arguments:"
echo echo
for opt in $(ls "$PO_DIR"); do 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}" local varvalue="${!varname}"
if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then
if [ "$varvalue" -a "$varvalue" = "yes" ]; if [ "$varvalue" -a "$varvalue" = "yes" ];
@@ -238,7 +238,7 @@ _eval_po() {
while read key val; do while read key val; do
case "$key" in case "$key" in
long) long)
opt=$(echo $val | sed 's/-/_/g' | tr [:lower:] [:upper:]) opt=$(echo $val | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
;; ;;
default) default)
default_val="$val" default_val="$val"
@@ -404,7 +404,7 @@ _parse_command_line() {
fi fi
if [ "$opt_is_ok" ]; then 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 if grep "^type:size" "$spec" >/dev/null; then
val=$(size_to_bytes $val) val=$(size_to_bytes $val)

8
bin/pt-mysql-summary
View File

@@ -23,7 +23,7 @@ PTDEBUG="${PTDEBUG:-""}"
EXIT_STATUS=0 EXIT_STATUS=0
log() { log() {
TS=$(date +%F-%T | tr :- _); TS=$(date +%F-%T | tr ':-' '_');
echo "$TS $*" echo "$TS $*"
} }
@@ -122,7 +122,7 @@ usage_or_errors() {
echo "Options and values after processing arguments:" echo "Options and values after processing arguments:"
echo echo
for opt in $(ls "$PO_DIR"); do 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}" local varvalue="${!varname}"
if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then
if [ "$varvalue" -a "$varvalue" = "yes" ]; if [ "$varvalue" -a "$varvalue" = "yes" ];
@@ -240,7 +240,7 @@ _eval_po() {
while read key val; do while read key val; do
case "$key" in case "$key" in
long) long)
opt=$(echo $val | sed 's/-/_/g' | tr [:lower:] [:upper:]) opt=$(echo $val | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
;; ;;
default) default)
default_val="$val" default_val="$val"
@@ -406,7 +406,7 @@ _parse_command_line() {
fi fi
if [ "$opt_is_ok" ]; then 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 if grep "^type:size" "$spec" >/dev/null; then
val=$(size_to_bytes $val) val=$(size_to_bytes $val)

12
bin/pt-stalk
View File

@@ -23,7 +23,7 @@ PTDEBUG="${PTDEBUG:-""}"
EXIT_STATUS=0 EXIT_STATUS=0
log() { log() {
TS=$(date +%F-%T | tr :- _); TS=$(date +%F-%T | tr ':-' '_');
echo "$TS $*" echo "$TS $*"
} }
@@ -122,7 +122,7 @@ usage_or_errors() {
echo "Options and values after processing arguments:" echo "Options and values after processing arguments:"
echo echo
for opt in $(ls "$PO_DIR"); do 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}" local varvalue="${!varname}"
if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then
if [ "$varvalue" -a "$varvalue" = "yes" ]; if [ "$varvalue" -a "$varvalue" = "yes" ];
@@ -240,7 +240,7 @@ _eval_po() {
while read key val; do while read key val; do
case "$key" in case "$key" in
long) long)
opt=$(echo $val | sed 's/-/_/g' | tr [:lower:] [:upper:]) opt=$(echo $val | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
;; ;;
default) default)
default_val="$val" default_val="$val"
@@ -406,7 +406,7 @@ _parse_command_line() {
fi fi
if [ "$opt_is_ok" ]; then 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 if grep "^type:size" "$spec" >/dev/null; then
val=$(size_to_bytes $val) val=$(size_to_bytes $val)
@@ -976,7 +976,7 @@ set_trg_func() {
return 0 # success return 0 # success
else else
# Trigger function is name of a built-in function. # 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 if [ "$func" = "status" -o "$func" = "processlist" ]; then
TRIGGER_FUNCTION="trg_$func" TRIGGER_FUNCTION="trg_$func"
return 0 # success return 0 # success
@@ -1103,7 +1103,7 @@ stalk() {
fi fi
if [ "$OPT_COLLECT" ]; then 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 # Check if we'll have enough disk space to collect. Disk space
# is also checked every interval while collecting. # is also checked every interval while collecting.

8
bin/pt-summary
View File

@@ -30,7 +30,7 @@ PTDEBUG="${PTDEBUG:-""}"
EXIT_STATUS=0 EXIT_STATUS=0
log() { log() {
TS=$(date +%F-%T | tr :- _); TS=$(date +%F-%T | tr ':-' '_');
echo "$TS $*" echo "$TS $*"
} }
@@ -129,7 +129,7 @@ usage_or_errors() {
echo "Options and values after processing arguments:" echo "Options and values after processing arguments:"
echo echo
for opt in $(ls "$PO_DIR"); do 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}" local varvalue="${!varname}"
if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then
if [ "$varvalue" -a "$varvalue" = "yes" ]; if [ "$varvalue" -a "$varvalue" = "yes" ];
@@ -247,7 +247,7 @@ _eval_po() {
while read key val; do while read key val; do
case "$key" in case "$key" in
long) long)
opt=$(echo $val | sed 's/-/_/g' | tr [:lower:] [:upper:]) opt=$(echo $val | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
;; ;;
default) default)
default_val="$val" default_val="$val"
@@ -413,7 +413,7 @@ _parse_command_line() {
fi fi
if [ "$opt_is_ok" ]; then 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 if grep "^type:size" "$spec" >/dev/null; then
val=$(size_to_bytes $val) val=$(size_to_bytes $val)

2
lib/bash/log_warn_die.sh
View File

@@ -29,7 +29,7 @@ PTDEBUG="${PTDEBUG:-""}"
EXIT_STATUS=0 EXIT_STATUS=0
log() { log() {
TS=$(date +%F-%T | tr :- _); TS=$(date +%F-%T | tr ':-' '_');
echo "$TS $*" echo "$TS $*"
} }

6
lib/bash/parse_options.sh
View File

@@ -119,7 +119,7 @@ usage_or_errors() {
echo "Options and values after processing arguments:" echo "Options and values after processing arguments:"
echo echo
for opt in $(ls "$PO_DIR"); do 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}" local varvalue="${!varname}"
if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then
# Typeless option, like --version, so it's given/TRUE # Typeless option, like --version, so it's given/TRUE
@@ -271,7 +271,7 @@ _eval_po() {
while read key val; do while read key val; do
case "$key" in case "$key" in
long) long)
opt=$(echo $val | sed 's/-/_/g' | tr [:lower:] [:upper:]) opt=$(echo $val | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
;; ;;
default) default)
default_val="$val" default_val="$val"
@@ -482,7 +482,7 @@ _parse_command_line() {
if [ "$opt_is_ok" ]; then if [ "$opt_is_ok" ]; then
# Get and transform the opt's long form. E.g.: -q == --quiet == QUIET. # 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. # Convert sizes.
if grep "^type:size" "$spec" >/dev/null; then if grep "^type:size" "$spec" >/dev/null; then