External/neofetch
1
0
Fork 0
mirror of https://github.com/dylanaraps/neofetch.git synced 2025-10-03 16:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #455 from dylanaraps/memory_fix

Browse Source 
Memory: Change math to fix possible bug
This commit is contained in:
Dylan Araps
2016-11-25 14:02:57 +11:00
committed by GitHub
parent 0b96b1e4c5 1281d762d0
commit f2e5c1c164
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
neofetch
View File

@@ -1034,7 +1034,7 @@ get_memory() {
;;
"Mac OS X" | "iPhone OS")
mem_total="$(($(sysctl -n hw.memsize) / 1024^2))"
mem_total="$(($(sysctl -n hw.memsize) / 1024 / 1024))"
mem_wired="$(vm_stat | awk '/wired/ { print $4 }')"
mem_active="$(vm_stat | awk '/active / { printf $3 }')"
mem_compressed="$(vm_stat | awk '/occupied/ { printf $5 }')"
@@ -1045,12 +1045,12 @@ get_memory() {
case "$distro" in
"NetBSD"*)
memfree="$(($(awk -F ':|kB' '/MemFree:/ {printf $2}' /proc/meminfo) / 1024))"
mem_total="$(($(sysctl -n hw.physmem64) / 1024^2))"
mem_total="$(($(sysctl -n hw.physmem64) / 1024 / 1024))"
;;
*)
memfree="$(($(vmstat | awk 'END{printf $5}') / 1024))"
mem_total="$(($(sysctl -n hw.physmem) / 1024^2))"
mem_total="$(($(sysctl -n hw.physmem) / 1024 / 1024))"
;;
esac
@@ -1067,9 +1067,9 @@ get_memory() {
;;
"Haiku")
mem_total="$(($(sysinfo -mem | awk -F '\\/ |)' '{print $2; exit}') / 1024^2))"
mem_total="$(($(sysinfo -mem | awk -F '\\/ |)' '{print $2; exit}') / 1024 / 1024))"
mem_used="$(sysinfo -mem | awk -F '\\/|)' '{print $2; exit}')"
mem_used="$((${mem_used/max} / 1024^2))"
mem_used="$((${mem_used/max} / 1024 / 1024))"
;;
esac
memory="${mem_used}MB / ${mem_total}MB"