From dd4517df0d8562919e30d9bdd5cf884c71009176 Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Mon, 22 Nov 2021 10:13:58 +0800
Subject: [PATCH] delete dependency bc

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

diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh
index 49269ed..9a585de 100644
--- a/generic-release-1.0/system-info.sh
+++ b/generic-release-1.0/system-info.sh
@@ -13,28 +13,19 @@
 welcome=$(uname -r)
 
 # Memory
-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)}')
-
-
+memory_total=$(free -m | awk '/Mem:/ { printf($2)}')
 if [ $memory_total -gt 0 ]
 then
-    memory_usage=`echo "scale=1; ($memory_total - $memory_free - $buffers - $cached - $sreclaimable) * 100.0 / $memory_total" |bc`
-    memory_usage="${memory_usage}%"
+    memory_usage=$(free -m | awk '/Mem:/ { printf("%3.1f%%", $3/$2*100)}')
 else
     memory_usage=0.0%
 fi
 
 # Swap memory
+swap_total=$(free -m | awk '/Swap:/ { printf($2)}')
 if [ $swap_total -gt 0 ]
 then
-    swap_mem=`echo "scale=1; ($swap_total - $swap_free) * 100.0 / $swap_total" |bc`
-    swap_mem="${swap_mem}%"
+    swap_mem=$(free -m | awk '/Swap:/ { printf("%3.1f%%", $3/$2*100)}')
 else
     swap_mem=0.0%
 fi
diff --git a/generic-release.spec b/generic-release.spec
index 1f50af2..2bdcbe3 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 46
+%define generic_release 47
 %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 bc
+Requires:       %{product_family}-repos
 Obsoletes: 	yum-utils yum-utils-help yum-utils-plugins
 
 %description
@@ -136,6 +136,9 @@ 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