mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-11 05:29:30 +00:00
Merged quote-tr-arguments
This commit is contained in:
@@ -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 $*"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -241,7 +241,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"
|
||||||
@@ -407,7 +407,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)
|
||||||
|
@@ -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 $*"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -243,7 +243,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"
|
||||||
@@ -409,7 +409,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)
|
||||||
@@ -611,7 +611,7 @@ shorten() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group_concat () {
|
group_concat () {
|
||||||
sed -e 'H; $!d;' -e 'x' -e 's/\n[[:space:]]*\([[:digit:]]*\)[[:space:]]*/, \1x/g' -e 's/[[:space:]][[:space:]]*/ /g' -e 's/, //' "${1}"
|
sed -e '{H; $!d;}' -e 'x' -e 's/\n[[:space:]]*\([[:digit:]]*\)[[:space:]]*/, \1x/g' -e 's/[[:space:]][[:space:]]*/ /g' -e 's/, //' "${1}"
|
||||||
}
|
}
|
||||||
|
|
||||||
# ###########################################################################
|
# ###########################################################################
|
||||||
|
10
bin/pt-stalk
10
bin/pt-stalk
@@ -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 $*"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -243,7 +243,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"
|
||||||
@@ -409,7 +409,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)
|
||||||
@@ -979,7 +979,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
|
||||||
@@ -1106,7 +1106,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.
|
||||||
|
@@ -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 $*"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -250,7 +250,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"
|
||||||
@@ -416,7 +416,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)
|
||||||
|
@@ -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 $*"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -274,7 +274,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"
|
||||||
@@ -485,7 +485,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
|
||||||
|
Reference in New Issue
Block a user