diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh index cf6c53a366756983d83e7fc8296358c48a1b055c..7609308a62b75c913cb4dce6bd3ba10c3a136522 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 60d5c4de0d528026d259f2a864cb380ab333aa75..ab0d4618a6a891250ce5eec41f03f0652f1914cc 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 - 1.0.49 +* Fri Dec 31 2021 gaochong - 1.0-50 +- fix memory info can`t show zero before decimal point + +* Wed Dec 01 2021 yaokai - 1.0-49 - Fix syntax errors -* Mon Nov 29 2021 yaokai - 1.0.48 +* Mon Nov 29 2021 yaokai - 1.0-48 - recover the dependency for bc * Mon Nov 22 2021 miao_kaibo - 1.0-47