From bd50f74b37e37a4a071db1c5a5593023d6cae573 Mon Sep 17 00:00:00 2001
From: BourneID <cam40902@gmail.com>
Date: Thu, 25 Oct 2018 23:36:16 +0100
Subject: [PATCH 1/2] Add check for MemAvailable and calculations if it does
 not exist.

---
 lgsm/functions/info_distro.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh
index 71e3aa33c..ac56fa233 100644
--- a/lgsm/functions/info_distro.sh
+++ b/lgsm/functions/info_distro.sh
@@ -91,6 +91,28 @@ load=$(uptime|awk -F 'load average: ' '{ print $2 }')
 
 ## Memory information
 
+# Issue #2005 - Kernel 3.14+ contains MemAvailable which should be used. All others will be calculated
+
+# define the following as integers due to AWK string issues
+declare -i physmemtotalkb
+declare -i physmemfreekb
+declare -i physmembufferskb
+declare -i physmemcachedkb
+declare -i physmemactualfreekb
+
+# get the raw KB values of these fields
+physmemtotalkb=$(grep MemTotal /proc/meminfo | awk '{print $2}')
+physmemfreekb=$(grep ^MemFree /proc/meminfo | awk '{print $2}')
+physmembufferskb=$(grep ^Buffers /proc/meminfo | awk '{print $2}')
+physmemcachedkb=$(grep ^Cached /proc/meminfo | awk '{print $2}')
+
+# check if MemAvailable Exists
+if grep -q ^MemAvailable /proc/meminfo; then
+physmemactualfreekb=$(grep ^MemAvailable /proc/meminfo | awk '{print $2}')
+else
+physmemactualfreekb=${physmemfreekb}+${physmembufferskb}+${physmemcachedkb}
+fi
+
 # Available RAM and swap.
 physmemtotalmb=$(($(grep MemTotal /proc/meminfo | awk '{print $2}')/1024))
 physmemtotal=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^MemTotal /proc/meminfo | awk '{print $2}')K")

From bb15be9e80b5b22c093f4451c7aa037927336b50 Mon Sep 17 00:00:00 2001
From: BourneID <cam40902@gmail.com>
Date: Fri, 26 Oct 2018 09:04:23 +0100
Subject: [PATCH 2/2] Fix for #2005 to look for MemAvailable, use if exists
 otherwise calculate it

---
 lgsm/functions/info_distro.sh | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh
index ac56fa233..c7adf2a9e 100644
--- a/lgsm/functions/info_distro.sh
+++ b/lgsm/functions/info_distro.sh
@@ -93,38 +93,27 @@ load=$(uptime|awk -F 'load average: ' '{ print $2 }')
 
 # Issue #2005 - Kernel 3.14+ contains MemAvailable which should be used. All others will be calculated
 
-# define the following as integers due to AWK string issues
-declare -i physmemtotalkb
-declare -i physmemfreekb
-declare -i physmembufferskb
-declare -i physmemcachedkb
-declare -i physmemactualfreekb
-
 # get the raw KB values of these fields
 physmemtotalkb=$(grep MemTotal /proc/meminfo | awk '{print $2}')
 physmemfreekb=$(grep ^MemFree /proc/meminfo | awk '{print $2}')
 physmembufferskb=$(grep ^Buffers /proc/meminfo | awk '{print $2}')
 physmemcachedkb=$(grep ^Cached /proc/meminfo | awk '{print $2}')
+physmemreclaimablekb=$(grep ^SReclaimable /proc/meminfo | awk '{print $2}')
 
 # check if MemAvailable Exists
 if grep -q ^MemAvailable /proc/meminfo; then
-physmemactualfreekb=$(grep ^MemAvailable /proc/meminfo | awk '{print $2}')
+    physmemactualfreekb=$(grep ^MemAvailable /proc/meminfo | awk '{print $2}')
 else
-physmemactualfreekb=${physmemfreekb}+${physmembufferskb}+${physmemcachedkb}
+    physmemactualfreekb=$((${physmemfreekb}+${physmembufferskb}+${physmemcachedkb}))
 fi
 
 # Available RAM and swap.
-physmemtotalmb=$(($(grep MemTotal /proc/meminfo | awk '{print $2}')/1024))
-physmemtotal=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^MemTotal /proc/meminfo | awk '{print $2}')K")
-physmemfree=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^MemAvailable /proc/meminfo | awk '{print $2}')K")
-physmemused=$(numfmt --to=iec --from=iec --suffix=B "$(($(grep "^MemTotal\:" /proc/meminfo | awk '{print $2}')-$(grep "^MemFree\:" /proc/meminfo | awk '{print $2}')-$(grep "^Buffers\:" /proc/meminfo | awk '{print $2}')-$(grep "^Cached\:" /proc/meminfo | awk '{print $2}')-$(grep "^SReclaimable\:" /proc/meminfo | awk '{print $2}')))K")
-{ # try
-	physmemavailable=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^MemAvailable /proc/meminfo | awk '{print $2}')K")
-	physmemcached=$(numfmt --to=iec --from=iec --suffix=B "$(($(grep ^Cached /proc/meminfo | awk '{print $2}')+$(grep "^SReclaimable\:" /proc/meminfo | awk '{print $2}')))K")
-} 2>/dev/null || { # fail silently, catch
-	physmemavailable="n/a"
-	physmemcached="n/a"
-}
+physmemtotalmb=$((${physmemtotalkb}/1024))
+physmemtotal=$(numfmt --to=iec --from=iec --suffix=B "${physmemtotalkb}K")
+physmemfree=$(numfmt --to=iec --from=iec --suffix=B "${physmemactualfreekb}K")
+physmemused=$(numfmt --to=iec --from=iec --suffix=B "$((${physmemtotalkb}-${physmemfreekb}-${physmembufferskb}-${physmemcachedkb}-${physmemreclaimablekb}))K")
+physmemavailable=$(numfmt --to=iec --from=iec --suffix=B "${physmemactualfreekb}K")
+physmemcached=$(numfmt --to=iec --from=iec --suffix=B "$((${physmemcachedkb}+${physmemreclaimablekb}))K")
 
 swaptotal=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^SwapTotal /proc/meminfo | awk '{print $2}')K")
 swapfree=$(numfmt --to=iec --from=iec --suffix=B "$(grep ^SwapFree /proc/meminfo | awk '{print $2}')K")