From bed258c57f33a2e2304bcefd2b899335a1d169e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BC=AA=E5=BC=80=E6=B3=A2?= <miaokaibo@outlook.com>
Date: Mon, 29 Nov 2021 08:07:14 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!89=20:?=
 =?UTF-8?q?=20delete=20dependency=20bc'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 generic-release-1.0/system-info.sh | 17 +++++++++++++----
 generic-release.spec               |  7 ++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh
index 9a585de..49269ed 100644
--- a/generic-release-1.0/system-info.sh
+++ b/generic-release-1.0/system-info.sh
@@ -13,19 +13,28 @@
 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 2bdcbe3..1f50af2 100644
--- a/generic-release.spec
+++ b/generic-release.spec
@@ -5,7 +5,7 @@
 %define dist_release_version 8
 %define generic_version 20.03
 %define generic_patch_level LTS
-%define generic_release 47
+%define generic_release 46
 %define builtin_release_version 1.0
 
 %define current_arch %{_arch}
@@ -28,7 +28,7 @@ Source2:	90-default.preset
 Source3:	99-default-disable.preset
 
 BuildRequires:	python3
-Requires:       %{product_family}-repos
+Requires:       %{product_family}-repos bc
 Obsoletes: 	yum-utils yum-utils-help yum-utils-plugins
 
 %description
@@ -136,9 +136,6 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/performance.sh
 
 %changelog
-* Mon Nov 22 2021 miao_kaibo <miao_kaibo@outlook.com> - 1.0-47
-- delete dependency bc
-
 * Thu Aug 26 2021 wangxiaorou <wangxiaorou@uniontech.com> - 1.0-46
 - fix system-info.sh syntax error
 
-- 
Gitee