Merge pull request #236 from dylanaraps/memavail

[Linux / Windows] Memory: Use memavail when available.
2016-05-06 18:46:14 +10:00 · 2016-05-06 18:46:14 +10:00 · 5c562a751c
commit 5c562a751c
parent 90925a35ef 1bb9115944
1 changed files with 8 additions and 2 deletions
--- a/6
+++ b/6
@ -1212,8 +1212,14 @@ getgpu () {
 getmemory () {
    case "$os" in
        "Linux" | "Windows")
+            if [ ! -z "$(grep -F "MemAvail" /proc/meminfo)" ]; then
+                mem=($(awk -F ':| kB' '/MemTotal|MemAvail/ {printf $2}' /proc/meminfo))
+                memused=$((mem[0] - mem[1]))
+            else
                mem=($(awk -F ':| kB' '/MemTotal|MemFree|Buffers|Cached/ {printf $2}' /proc/meminfo) 0 0)
                memused=$((mem[0] - mem[1] - mem[2] - mem[3]))
+            fi
+
            memused=$((memused / 1024))
            memtotal=$((mem[0] / 1024))
        ;;