Declare and assign separately to avoid masking return values

kgryte · kgryte · commit 2234c093590b · 2018-09-07T17:47:07.000-07:00
diff --git a/tools/ci/circle/system_metrics b/tools/ci/circle/system_metrics
@@ -42,7 +42,8 @@ on_error() {
 #   memory_used_in_MB,total_memory_in_MB,percent_used
 #
 memory_usage() {
-	local mem=$(free -m | awk 'NR==2 {printf "%sMB,%sMB,%.2f%%)", $3, $2, $3*100/$2}')
+	local mem
+	mem=$(free -m | awk 'NR==2 {printf "%sMB,%sMB,%.2f%%)", $3, $2, $3*100/$2}')
 	echo "${mem}"
 }
 
@@ -53,13 +54,15 @@ memory_usage() {
 #    disk_used_in_GB,total_disk_space_in_GB,percent_used
 #
 disk_usage() {
-	local disk=$(df -h | awk '$NF=="/" {printf "%dGB,%dGB,%s", $3, $2, $5}')
+	local disk
+	disk=$(df -h | awk '$NF=="/" {printf "%dGB,%dGB,%s", $3, $2, $5}')
 	echo "${disk}"
 }
 
 # Prints the system load average.
 load_avg() {
-	local load=$(top -bn1 | grep load | awk '{printf "%.2f", $(NF-2)}')
+	local load
+	load=$(top -bn1 | grep load | awk '{printf "%.2f", $(NF-2)}')
 	echo "${load}"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,8 @@ on_error() {`
`42`	`42`	`# memory_used_in_MB,total_memory_in_MB,percent_used`
`43`	`43`	`#`
`44`	`44`	`memory_usage() {`
`45`		`- local mem=$(free -m \| awk 'NR==2 {printf "%sMB,%sMB,%.2f%%)", $3, $2, $3*100/$2}')`
	`45`	`+ local mem`
	`46`	`+ mem=$(free -m \| awk 'NR==2 {printf "%sMB,%sMB,%.2f%%)", $3, $2, $3*100/$2}')`
`46`	`47`	`echo "${mem}"`
`47`	`48`	`}`
`48`	`49`
`@@ -53,13 +54,15 @@ memory_usage() {`
`53`	`54`	`# disk_used_in_GB,total_disk_space_in_GB,percent_used`
`54`	`55`	`#`
`55`	`56`	`disk_usage() {`
`56`		`- local disk=$(df -h \| awk '$NF=="/" {printf "%dGB,%dGB,%s", $3, $2, $5}')`
	`57`	`+ local disk`
	`58`	`+ disk=$(df -h \| awk '$NF=="/" {printf "%dGB,%dGB,%s", $3, $2, $5}')`
`57`	`59`	`echo "${disk}"`
`58`	`60`	`}`
`59`	`61`
`60`	`62`	`# Prints the system load average.`
`61`	`63`	`load_avg() {`
`62`		`- local load=$(top -bn1 \| grep load \| awk '{printf "%.2f", $(NF-2)}')`
	`64`	`+ local load`
	`65`	`+ load=$(top -bn1 \| grep load \| awk '{printf "%.2f", $(NF-2)}')`
`63`	`66`	`echo "${load}"`
`64`	`67`	`}`
`65`	`68`