diff --git a/bin/pt-ioprofile b/bin/pt-ioprofile index 24f718e7..5077e2e6 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 $*" } @@ -241,7 +241,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" @@ -407,7 +407,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 584fbac2..6cfcc0f5 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 $*" } @@ -243,7 +243,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" @@ -409,7 +409,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) @@ -611,7 +611,7 @@ shorten() { } 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}" } # ########################################################################### diff --git a/bin/pt-stalk b/bin/pt-stalk index b571d7e3..d424e2ad 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 $*" } @@ -243,7 +243,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" @@ -409,7 +409,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) @@ -979,7 +979,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 @@ -1106,7 +1106,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 6c713804..126437fe 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 $*" } @@ -250,7 +250,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" @@ -416,7 +416,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 c1999cfa..76140704 100644 --- a/lib/bash/parse_options.sh +++ b/lib/bash/parse_options.sh @@ -274,7 +274,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" @@ -485,7 +485,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