# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1562493141 -7200
# Node ID c56eca297b15a6341fbc6a013f72e7d5e258e2aa
# Parent  b932799f8ae1490d86f6222930fb0268ef08afff
hardware.cgi: fix mem usage

diff -r b932799f8ae1 -r c56eca297b15 hardware.cgi
--- a/hardware.cgi	Sat Jul 06 15:03:14 2019 +0200
+++ b/hardware.cgi	Sun Jul 07 11:52:21 2019 +0200
@@ -342,7 +342,7 @@
 
 		# CPU frequency
 		if [ -n "$(ls /sys/devices/system/cpu/*/cpufreq/cpuinfo_cur_freq 2>/dev/null)" ]; then
-			echo "<p><span data-icon=\"@daemons@\">$(_ 'CPU:')</span>"
+			echo "<p><span data-icon=\"@daemons@\">$(sed '/name/!ds|.*: ||;q' /proc/cpuinfo) :</span>"
 			for f in /sys/devices/system/cpu/*/cpufreq/cpuinfo_cur_freq; do
 				awk '{ print $1/1000 "MHz" }' < $f
 			done
@@ -610,8 +610,8 @@
 		# System memory
 		#
 		mem_total=$(free -m | awk '$1 ~ "M" {print $2}')
-		mem_used=$((100 * $(free -m | awk '$1 ~ "+" {print $3}') / mem_total))
-		mem_buff=$((100 * $(free -m | awk '$1 ~ "M" {print $6}') / mem_total))
+		mem_used=$((100 * $(free -m | awk '$1 ~ "M" {print $3}') / $mem_total))
+		mem_buff=$((100 * $(free -m | awk '$1 ~ "M" {print $6}') / $mem_total))
 		mem_free=$((100 - mem_used - mem_buff))
 
 		cat <<EOT
@@ -644,7 +644,6 @@
 
 free -m | awk '
 $1 ~ "M" {print "<tr><td>"$1"</td><td>"$2"</td><td>"$3"</td><td>"$4"</td><td>"$5"</td><td>"$6"</td></tr>"}
-$1 ~ "+" {print "<tr><td>"$1 $2"</td><td></td><td>"$3"</td><td>"$4"</td><td></td><td></td></tr>"}
 $1 ~ "S" {print "<tr><td>"$1"</td><td>"$2"</td><td>"$3"</td><td>"$4"</td><td></td><td></td></tr>"}'
 
 		cat <<EOT