Merge pull request #236 from dylanaraps/memavail

[Linux / Windows] Memory: Use memavail when available.
This commit is contained in:
Dylan Araps 2016-05-06 18:46:14 +10:00
commit 5c562a751c

View file

@ -1212,8 +1212,14 @@ getgpu () {
getmemory () {
case "$os" in
"Linux" | "Windows")
mem=($(awk -F ':| kB' '/MemTotal|MemFree|Buffers|Cached/ {printf $2}' /proc/meminfo) 0 0)
memused=$((mem[0] - mem[1] - mem[2] - mem[3]))
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))
;;