From 68c9801d68521274e53f93624a0840351b5896a1 Mon Sep 17 00:00:00 2001
From: gaochong <gaochong@uniontech.com>
Date: Tue, 4 Jan 2022 12:27:44 +0800
Subject: [PATCH] Fix memory info can`t show zero before decimal point -
 #I4KLCT

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

diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh
index cf6c53a..7609308 100644
--- a/generic-release-1.0/system-info.sh
+++ b/generic-release-1.0/system-info.sh
@@ -24,8 +24,7 @@ swap_free=$(cat /proc/meminfo | awk '/^SwapFree:/ { 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=$(printf %.1f `echo "scale=1; ($memory_total - $memory_free - $buffers - $cached - $sreclaimable) * 100.0 / $memory_total" |bc`)%
 else
     memory_usage=0.0%
 fi
@@ -33,8 +32,7 @@ fi
 # Swap memory
 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=$(printf %.1f `echo "scale=1; ($swap_total - $swap_free) * 100.0 / $swap_total" |bc`)%
 else
     swap_mem=0.0%
 fi
diff --git a/generic-release.spec b/generic-release.spec
index 60d5c4d..ab0d461 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 49
+%define generic_release 50
 %define builtin_release_version 1.0
 
 %define current_arch %{_arch}
@@ -136,10 +136,13 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/performance.sh
 
 %changelog
-* Wed Dec 01 2021 yaokai <yaokai13@huawei.com> - 1.0.49
+* Fri Dec 31 2021 gaochong <gaochong@uniontech.com> - 1.0-50
+- fix memory info can`t show zero before decimal point
+
+* Wed Dec 01 2021 yaokai <yaokai13@huawei.com> - 1.0-49
 - Fix syntax errors
 
-* Mon Nov 29 2021 yaokai <yaokai13@huawei.com> - 1.0.48
+* Mon Nov 29 2021 yaokai <yaokai13@huawei.com> - 1.0-48
 - recover the dependency for bc
 
 * Mon Nov 22 2021 miao_kaibo <miao_kaibo@outlook.com> - 1.0-47
-- 
Gitee