kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit f2e5c1c164
1 changed files with 5 additions and 5 deletions
Show stats 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") "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_wired="$(vm_stat | awk '/wired/ { print $4 }')"
mem_active="$(vm_stat | awk '/active / { printf $3 }')" mem_active="$(vm_stat | awk '/active / { printf $3 }')"
mem_compressed="$(vm_stat | awk '/occupied/ { printf $5 }')" mem_compressed="$(vm_stat | awk '/occupied/ { printf $5 }')"
@ -1045,12 +1045,12 @@ get_memory() {
case "$distro" in case "$distro" in
"NetBSD"*) "NetBSD"*)
memfree="$(($(awk -F ':|kB' '/MemFree:/ {printf $2}' /proc/meminfo) / 1024))" 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))" memfree="$(($(vmstat | awk 'END{printf $5}') / 1024))"
mem_total="$(($(sysctl -n hw.physmem) / 1024^2))" mem_total="$(($(sysctl -n hw.physmem) / 1024 / 1024))"
;; ;;
esac esac
@ -1067,9 +1067,9 @@ get_memory() {
;; ;;
"Haiku") "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="$(sysinfo -mem | awk -F '\\/|)' '{print $2; exit}')"
mem_used="$((${mem_used/max} / 1024^2))" mem_used="$((${mem_used/max} / 1024 / 1024))"
;; ;;
esac esac
memory="${mem_used}MB / ${mem_total}MB" memory="${mem_used}MB / ${mem_total}MB"