Percona Toolkit moved to https://jira.percona.com/projects/PT

Merge lp:~percona-toolkit-dev/percona-toolkit/quote-tr-arguments into lp:percona-toolkit/2.1

  1. quote-tr-arguments
  2. Merge into 2.1
Proposed by Brian Fraser
Status: Merged
Approved by: Daniel Nichter
Approved revision: 355
Merged at revision: 377
Proposed branch: lp:~percona-toolkit-dev/percona-toolkit/quote-tr-arguments
Merge into: lp:percona-toolkit/2.1
Diff against target: 221 lines (+22/-22)
6 files modified
bin/pt-ioprofile (+4/-4)
bin/pt-mysql-summary (+4/-4)
bin/pt-stalk (+6/-6)
bin/pt-summary (+4/-4)
lib/bash/log_warn_die.sh (+1/-1)
lib/bash/parse_options.sh (+3/-3)
To merge this branch: bzr merge lp:~percona-toolkit-dev/percona-toolkit/quote-tr-arguments
Reviewer Review Type Date Requested Status
Daniel Nichter Needs Information
Review via email: mp+120929@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Nichter (daniel-nichter) :
review: Approve
Revision history for this message
Daniel Nichter (daniel-nichter) wrote :

Create and link to a bug before merging please.

review: Needs Information

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/pt-ioprofile'
2--- bin/pt-ioprofile 2012-08-03 18:41:41 +0000
3+++ bin/pt-ioprofile 2012-08-23 06:40:56 +0000
4@@ -21,7 +21,7 @@
5 EXIT_STATUS=0
6
7 log() {
8- TS=$(date +%F-%T | tr :- _);
9+ TS=$(date +%F-%T | tr ':-' '_');
10 echo "$TS $*"
11 }
12
13@@ -120,7 +120,7 @@
14 echo "Options and values after processing arguments:"
15 echo
16 for opt in $(ls "$PO_DIR"); do
17- local varname="OPT_$(echo "$opt" | tr a-z- A-Z_)"
18+ local varname="OPT_$(echo "$opt" | tr 'a-z-' 'A-Z_')"
19 local varvalue="${!varname}"
20 if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then
21 if [ "$varvalue" -a "$varvalue" = "yes" ];
22@@ -238,7 +238,7 @@
23 while read key val; do
24 case "$key" in
25 long)
26- opt=$(echo $val | sed 's/-/_/g' | tr [:lower:] [:upper:])
27+ opt=$(echo $val | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
28 ;;
29 default)
30 default_val="$val"
31@@ -404,7 +404,7 @@
32 fi
33
34 if [ "$opt_is_ok" ]; then
35- opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr [:lower:] [:upper:])
36+ opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
37
38 if grep "^type:size" "$spec" >/dev/null; then
39 val=$(size_to_bytes $val)
40
41=== modified file 'bin/pt-mysql-summary'
42--- bin/pt-mysql-summary 2012-08-03 18:41:41 +0000
43+++ bin/pt-mysql-summary 2012-08-23 06:40:56 +0000
44@@ -23,7 +23,7 @@
45 EXIT_STATUS=0
46
47 log() {
48- TS=$(date +%F-%T | tr :- _);
49+ TS=$(date +%F-%T | tr ':-' '_');
50 echo "$TS $*"
51 }
52
53@@ -122,7 +122,7 @@
54 echo "Options and values after processing arguments:"
55 echo
56 for opt in $(ls "$PO_DIR"); do
57- local varname="OPT_$(echo "$opt" | tr a-z- A-Z_)"
58+ local varname="OPT_$(echo "$opt" | tr 'a-z-' 'A-Z_')"
59 local varvalue="${!varname}"
60 if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then
61 if [ "$varvalue" -a "$varvalue" = "yes" ];
62@@ -240,7 +240,7 @@
63 while read key val; do
64 case "$key" in
65 long)
66- opt=$(echo $val | sed 's/-/_/g' | tr [:lower:] [:upper:])
67+ opt=$(echo $val | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
68 ;;
69 default)
70 default_val="$val"
71@@ -406,7 +406,7 @@
72 fi
73
74 if [ "$opt_is_ok" ]; then
75- opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr [:lower:] [:upper:])
76+ opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
77
78 if grep "^type:size" "$spec" >/dev/null; then
79 val=$(size_to_bytes $val)
80
81=== modified file 'bin/pt-stalk'
82--- bin/pt-stalk 2012-08-14 15:11:41 +0000
83+++ bin/pt-stalk 2012-08-23 06:40:56 +0000
84@@ -23,7 +23,7 @@
85 EXIT_STATUS=0
86
87 log() {
88- TS=$(date +%F-%T | tr :- _);
89+ TS=$(date +%F-%T | tr ':-' '_');
90 echo "$TS $*"
91 }
92
93@@ -122,7 +122,7 @@
94 echo "Options and values after processing arguments:"
95 echo
96 for opt in $(ls "$PO_DIR"); do
97- local varname="OPT_$(echo "$opt" | tr a-z- A-Z_)"
98+ local varname="OPT_$(echo "$opt" | tr 'a-z-' 'A-Z_')"
99 local varvalue="${!varname}"
100 if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then
101 if [ "$varvalue" -a "$varvalue" = "yes" ];
102@@ -240,7 +240,7 @@
103 while read key val; do
104 case "$key" in
105 long)
106- opt=$(echo $val | sed 's/-/_/g' | tr [:lower:] [:upper:])
107+ opt=$(echo $val | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
108 ;;
109 default)
110 default_val="$val"
111@@ -406,7 +406,7 @@
112 fi
113
114 if [ "$opt_is_ok" ]; then
115- opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr [:lower:] [:upper:])
116+ opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
117
118 if grep "^type:size" "$spec" >/dev/null; then
119 val=$(size_to_bytes $val)
120@@ -976,7 +976,7 @@
121 return 0 # success
122 else
123 # Trigger function is name of a built-in function.
124- func=$(echo "$func" | tr [:upper:] [:lower:])
125+ func=$(echo "$func" | tr '[:upper:]' '[:lower:]')
126 if [ "$func" = "status" -o "$func" = "processlist" ]; then
127 TRIGGER_FUNCTION="trg_$func"
128 return 0 # success
129@@ -1103,7 +1103,7 @@
130 fi
131
132 if [ "$OPT_COLLECT" ]; then
133- local prefix="${OPT_PREFIX:-$(date +%F-%T | tr :- _)}"
134+ local prefix="${OPT_PREFIX:-$(date +%F-%T | tr ':-' '_')}"
135
136 # Check if we'll have enough disk space to collect. Disk space
137 # is also checked every interval while collecting.
138
139=== modified file 'bin/pt-summary'
140--- bin/pt-summary 2012-08-03 18:41:41 +0000
141+++ bin/pt-summary 2012-08-23 06:40:56 +0000
142@@ -30,7 +30,7 @@
143 EXIT_STATUS=0
144
145 log() {
146- TS=$(date +%F-%T | tr :- _);
147+ TS=$(date +%F-%T | tr ':-' '_');
148 echo "$TS $*"
149 }
150
151@@ -129,7 +129,7 @@
152 echo "Options and values after processing arguments:"
153 echo
154 for opt in $(ls "$PO_DIR"); do
155- local varname="OPT_$(echo "$opt" | tr a-z- A-Z_)"
156+ local varname="OPT_$(echo "$opt" | tr 'a-z-' 'A-Z_')"
157 local varvalue="${!varname}"
158 if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then
159 if [ "$varvalue" -a "$varvalue" = "yes" ];
160@@ -247,7 +247,7 @@
161 while read key val; do
162 case "$key" in
163 long)
164- opt=$(echo $val | sed 's/-/_/g' | tr [:lower:] [:upper:])
165+ opt=$(echo $val | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
166 ;;
167 default)
168 default_val="$val"
169@@ -413,7 +413,7 @@
170 fi
171
172 if [ "$opt_is_ok" ]; then
173- opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr [:lower:] [:upper:])
174+ opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
175
176 if grep "^type:size" "$spec" >/dev/null; then
177 val=$(size_to_bytes $val)
178
179=== modified file 'lib/bash/log_warn_die.sh'
180--- lib/bash/log_warn_die.sh 2012-03-24 17:20:09 +0000
181+++ lib/bash/log_warn_die.sh 2012-08-23 06:40:56 +0000
182@@ -29,7 +29,7 @@
183 EXIT_STATUS=0
184
185 log() {
186- TS=$(date +%F-%T | tr :- _);
187+ TS=$(date +%F-%T | tr ':-' '_');
188 echo "$TS $*"
189 }
190
191
192=== modified file 'lib/bash/parse_options.sh'
193--- lib/bash/parse_options.sh 2012-07-21 17:57:53 +0000
194+++ lib/bash/parse_options.sh 2012-08-23 06:40:56 +0000
195@@ -119,7 +119,7 @@
196 echo "Options and values after processing arguments:"
197 echo
198 for opt in $(ls "$PO_DIR"); do
199- local varname="OPT_$(echo "$opt" | tr a-z- A-Z_)"
200+ local varname="OPT_$(echo "$opt" | tr 'a-z-' 'A-Z_')"
201 local varvalue="${!varname}"
202 if ! grep -q "type:" "$PO_DIR/$opt" >/dev/null; then
203 # Typeless option, like --version, so it's given/TRUE
204@@ -271,7 +271,7 @@
205 while read key val; do
206 case "$key" in
207 long)
208- opt=$(echo $val | sed 's/-/_/g' | tr [:lower:] [:upper:])
209+ opt=$(echo $val | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
210 ;;
211 default)
212 default_val="$val"
213@@ -482,7 +482,7 @@
214
215 if [ "$opt_is_ok" ]; then
216 # Get and transform the opt's long form. E.g.: -q == --quiet == QUIET.
217- opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr [:lower:] [:upper:])
218+ opt=$(cat "$spec" | grep '^long:' | cut -d':' -f2 | sed 's/-/_/g' | tr '[:lower:]' '[:upper:]')
219
220 # Convert sizes.
221 if grep "^type:size" "$spec" >/dev/null; then

Subscribers

People subscribed via source and target branches