mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-13 14:39:28 +00:00
shell tools: Quote the arguments to tr
This commit is contained in:
@@ -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)
|
||||
|
@@ -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)
|
||||
|
12
bin/pt-stalk
12
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.
|
||||
|
@@ -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)
|
||||
|
@@ -29,7 +29,7 @@ PTDEBUG="${PTDEBUG:-""}"
|
||||
EXIT_STATUS=0
|
||||
|
||||
log() {
|
||||
TS=$(date +%F-%T | tr :- _);
|
||||
TS=$(date +%F-%T | tr ':-' '_');
|
||||
echo "$TS $*"
|
||||
}
|
||||
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user