Reinstate mem_perc lost during refactoring of sys info

Author: innovara

rpmbuild/RPMS/noarch/sysmotd-0.0.4-1.fc38.noarch.rpm

@@ -1,5 +1,5 @@
 Name:           sysmotd
-Version:        0.0.3
+Version:        0.0.4
 Release:        1%{?dist}
 Summary:        Generates a MOTD (Message Of The Day) including system information on Fedora Linux
 BuildArch:      noarch
@@ -67,11 +67,14 @@ rm -f /run/motd.d/*%{name}*
 
 
 %changelog
-* Thu Apr 27 2023 Manuel Fombuena <mfombuena@innovara.co.uk>
-- Version 0.0.3 change layout of system information to a table to prevent misalignment of items
+* Mon Oct 2 2023 Manuel Fombuena <mfombuena@innovara.co.uk>
+- Version 0.0.4: mem_perc re-added
+
+* Sun Oct 1 2023 Manuel Fombuena <mfombuena@innovara.co.uk>
+- Version 0.0.3: system information layout changed to a table to prevent misalignment of items
 
 * Thu Apr 27 2023 Manuel Fombuena <mfombuena@innovara.co.uk>
-- Version 0.0.2 adding SElinux info
+- Version 0.0.2: SElinux info added
 
 * Mon Dec 26 2022 Manuel Fombuena <mfombuena@innovara.co.uk>
-- First version being packaged
+- Version 0.0.1: first version packaged

rpmbuild/SOURCES/sysmotd-0.0.4.tar.gz

@@ -46,10 +46,15 @@ load_15=$(awk '{print $3}' /proc/loadavg)
 # memory
 mem_total=$(awk '/MemTotal/ {print $2;}' /proc/meminfo)
 mem_used=$(($mem_total-$(awk '/MemFree/ {print $2;}' /proc/meminfo)-$(awk '/Buffers/ {print $2;}' /proc/meminfo)-$(awk '/\yCached\y/ {print $2;}' /proc/meminfo)))
+if [[ $mem_total != 0 ]]; then
+   mem_perc=$((mem_used*100/mem_total))
+else
+   mem_perc=0
+fi
 mem_perc=$(($mem_used*100/$mem_total))
 swap_total=$(awk '/SwapTotal/ {print $2;}' /proc/meminfo)
 swap_used=$((${swap_total} - $(awk '/SwapFree/ {print $2;}' /proc/meminfo)-$(awk '/SwapCached/ {print $2;}' /proc/meminfo)))
-if [[ "$swap_total" != 0 ]]; then
+if [[ $swap_total != 0 ]]; then
    swap_perc=$((swap_used*100/swap_total))
 else
    swap_perc=0
@@ -94,7 +99,7 @@ else
    sysarray+=(${se_status}';') #r3 c5
 fi
 sysarray+=('Memory usage:;') #r4 c1
-sysarray+=($((${mem_used}/1024))'/'$((${mem_total}/1024))'M;') #r4 c2
+sysarray+=($((${mem_used}/1024))'/'$((${mem_total}/1024))'M ('${mem_perc}'%);') #r4 c2
 sysarray+=($'\t;') #r4 c3
 sysarray+=('Processes:;') #r4 c4
 sysarray+=(${processes}';') #r4 c5