From 0e98e7572e57ddb7c092a83871a9db3d3dec05ec Mon Sep 17 00:00:00 2001
From: gaochong <gaochong@uniontech.com>
Date: Fri, 31 Dec 2021 16:59:11 +0800
Subject: [PATCH] Fix issue #I4LU3V - display wrong meminfo when enable
 zh_CN.UTF-8

* generic-release-1.0/system-info.sh
  get memeroy info from /proc/meminfo instead of command free

Signed-off-by: gaochong <gaochong@uniontech.com>
---
 generic-release-1.0/system-info.sh | 16 ++++++++++++----
 generic-release.spec               |  7 +++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh
index 58039d0..182368b 100644
--- a/generic-release-1.0/system-info.sh
+++ b/generic-release-1.0/system-info.sh
@@ -13,19 +13,27 @@
 welcome=$(uname -r)
 
 # Memory
-memory_total=$(free -m | awk '/Mem:/ { printf($2)}')
+memory_total=$(cat /proc/meminfo | awk '/^MemTotal:/ {printf($2)}')
+memory_free=$(cat /proc/meminfo | awk '/^MemFree:/ { printf($2)}')
+buffers=$(cat /proc/meminfo | awk '/^Buffers:/ { printf($2)}')
+cached=$(cat /proc/meminfo | awk '/^Cached:/ { printf($2)}')
+sreclaimable=$(cat /proc/meminfo | awk '/^SReclaimable:/ { printf($2)}')
+swap_total=$(cat /proc/meminfo | awk '/^SwapTotal:/ { printf($2)}')
+swap_free=$(cat /proc/meminfo | awk '/^SwapFree:/ { printf($2)}')
+
 if [[ $memory_total -gt 0 ]]
 then
-    memory_usage=$(free -m | awk '/Mem:/ { printf("%3.1f%%", $3/$2*100)}')
+    memory_usage=`echo "scale=1; ($memory_total - $memory_free - $buffers - $cached - $sreclaimable) * 100.0 / $memory_total" |bc`
+    memory_usage="${memory_usage}%"
 else
     memory_usage=0.0%
 fi
 
 # Swap memory
-swap_total=$(free -m | awk '/Swap:/ { printf($2)}')
 if [[ $swap_total -gt 0 ]]
 then
-    swap_mem=$(free -m | awk '/Swap:/ { printf("%3.1f%%", $3/$2*100)}')
+    swap_mem=`echo "scale=1; ($swap_total - $swap_free) * 100.0 / $swap_total" |bc`
+    swap_mem="${swap_mem}%"
 else
     swap_mem=0.0%
 fi
diff --git a/generic-release.spec b/generic-release.spec
index 46cac25..58196e3 100644
--- a/generic-release.spec
+++ b/generic-release.spec
@@ -6,7 +6,7 @@
 %define generic_version 20.03
 %define generic_patch_level LTS
 %define generic_patch_level_extend SP2
-%define generic_release 46
+%define generic_release 47
 %define builtin_release_version 1.0
 
 %define current_arch %{_arch}
@@ -37,7 +37,7 @@ Source8:        dot-cshrc
 Source9:        21-openEuler.conf
 
 BuildRequires:	python
-Requires:       %{product_family}-repos
+Requires:       %{product_family}-repos bc
 Obsoletes: 	yum-utils yum-utils-help yum-utils-plugins
 
 %description
@@ -177,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /root/.cshrc
 
 %changelog
+* Fri Dec 31 2021 gaochong <gaochong@uniontech.com> - 1.0-47
+- get memeroy info from /proc/meminfo instead of command free
+
 * Wed Dec 01 2021 yaokai <yaokai13@huawei.com> - 1.0-46
 - Fix syntax error
 
-- 
Gitee