From cfcef354b0f3f7b89cd94dd7b38f64a9c4c8fa67 Mon Sep 17 00:00:00 2001 From: "Brian Fraser fraserb@gmail.com" <> Date: Tue, 3 Apr 2012 11:07:30 -0300 Subject: [PATCH] section(): Less printf, more awk --- bin/pt-mysql-summary | 12 ++++++------ bin/pt-summary | 12 ++++++------ lib/bash/report_formatting.sh | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bin/pt-mysql-summary b/bin/pt-mysql-summary index 0542ac56..f57a69b9 100755 --- a/bin/pt-mysql-summary +++ b/bin/pt-mysql-summary @@ -556,13 +556,13 @@ fuzzy_pct () { section () { local str="$1" - local line="$(printf '# %-60s' "${str} _" | awk '{ - i = index($0, "_"); - x = substr($0, i); + awk -v var="${str} _" 'BEGIN { + line = sprintf("# %-60s", var); + i = index(line, "_"); + x = substr(line, i); gsub(/[_ \t]/, "#", x); - printf("%s%s\n", substr($0, 1, i-1), x); - }')" - printf "%s\n" "${line}" + printf("%s%s\n", substr(line, 1, i-1), x); + }' } NAME_VAL_LEN=12 diff --git a/bin/pt-summary b/bin/pt-summary index be794074..b1b9ffa4 100755 --- a/bin/pt-summary +++ b/bin/pt-summary @@ -693,13 +693,13 @@ fuzzy_pct () { section () { local str="$1" - local line="$(printf '# %-60s' "${str} _" | awk '{ - i = index($0, "_"); - x = substr($0, i); + awk -v var="${str} _" 'BEGIN { + line = sprintf("# %-60s", var); + i = index(line, "_"); + x = substr(line, i); gsub(/[_ \t]/, "#", x); - printf("%s%s\n", substr($0, 1, i-1), x); - }')" - printf "%s\n" "${line}" + printf("%s%s\n", substr(line, 1, i-1), x); + }' } NAME_VAL_LEN=12 diff --git a/lib/bash/report_formatting.sh b/lib/bash/report_formatting.sh index b6bbeedb..0cbf7b9f 100644 --- a/lib/bash/report_formatting.sh +++ b/lib/bash/report_formatting.sh @@ -64,13 +64,13 @@ fuzzy_pct () { # with #'s and all underscores with spaces. section () { local str="$1" - local line="$(printf '# %-60s' "${str} _" | awk '{ - i = index($0, "_"); - x = substr($0, i); + awk -v var="${str} _" 'BEGIN { + line = sprintf("# %-60s", var); + i = index(line, "_"); + x = substr(line, i); gsub(/[_ \t]/, "#", x); - printf("%s%s\n", substr($0, 1, i-1), x); - }')" - printf "%s\n" "${line}" + printf("%s%s\n", substr(line, 1, i-1), x); + }' } NAME_VAL_LEN=12