Fix cpu_info bug

aaronkollasch · aaronkollasch · commit 760fe8ac11bf · 2025-05-16T21:16:45.000-04:00
Grepping the output of top could sometimes return the grep process,
leading to a nonsensical %CPU reading.
diff --git a/scripts/cpu_info.sh b/scripts/cpu_info.sh
@@ -9,7 +9,7 @@ get_percent()
 {
   case $(uname -s) in
     Linux)
-      percent=$(LC_NUMERIC=en_US.UTF-8 top -bn2 -d 0.01 | grep "Cpu(s)" | tail -1 | sed "s/.*, *\([0-9.]*\)%* id.*/\1/" | awk '{print 100 - $1"%"}')
+      percent=$(LC_NUMERIC=en_US.UTF-8 top -bn2 -d 0.01 | grep "[C]pu(s)" | tail -1 | sed "s/.*, *\([0-9.]*\)%* id.*/\1/" | awk '{print 100 - $1"%"}')
       normalize_percent_len $percent
       ;;
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ get_percent()`
`9`	`9`	`{`
`10`	`10`	`case $(uname -s) in`
`11`	`11`	`Linux)`
`12`		`- percent=$(LC_NUMERIC=en_US.UTF-8 top -bn2 -d 0.01 \| grep "Cpu(s)" \| tail -1 \| sed "s/., \([0-9.]\)% id.*/\1/" \| awk '{print 100 - $1"%"}')`
	`12`	`+ percent=$(LC_NUMERIC=en_US.UTF-8 top -bn2 -d 0.01 \| grep "[C]pu(s)" \| tail -1 \| sed "s/., \([0-9.]\)% id.*/\1/" \| awk '{print 100 - $1"%"}')`
`13`	`13`	`normalize_percent_len $percent`
`14`	`14`	`;;`
`15`	`15`