From 8a9ba27a3bd203b8dfc0cbb9d5f696236212716a Mon Sep 17 00:00:00 2001 From: gaochong Date: Tue, 4 Jan 2022 12:02:17 +0800 Subject: [PATCH] Fix memory info can`t show zero before decimal point - #I4KLCT Signed-off-by: gaochong --- generic-release-1.0/system-info.sh | 6 ++---- generic-release.spec | 5 ++++- 2 files changed, 6 insertions(+), 5 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 c327117..f4fa52a 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -4,7 +4,7 @@ %define variant_lowercase server %define dist_release_version 8 %define generic_version 21.09 -%define generic_release 51 +%define generic_release 52 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -135,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/performance.sh %changelog +* Fri Dec 31 2021 gaochong - 1.0-52 +- fix memory info can`t show zero before decimal point + * Wed Dec 01 2021 yaokai - 1.0.51 - Fix syntax errors -- Gitee