From 4f8bf2699d75b67a2053bf92577c170b6e360411 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 15 Dec 2016 23:19:40 +1100 Subject: [PATCH] CPU Usage: Add missing core commands and update old ones --- neofetch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 03dfc20f..8882c7a8 100755 --- a/neofetch +++ b/neofetch @@ -929,11 +929,13 @@ get_cpu_usage() { *) # Get cores if unset - if [[ -z "$cores" ]]; then + if [[ "$cpu_cores" == "off" ]]; then case "$os" in - "Linux") cores="$(awk -F ': ' '/siblings/ {printf $2; exit}' /proc/cpuinfo)" ;; - "Mac OS X" | "BSD") cores="$(sysctl -n hw.ncpu)" ;; + "Linux") cores="$(grep -c "^processor" /proc/cpuinfo)" ;; + "Mac OS X") cores="$(sysctl -n hw.logicalcpu_max)" ;; + "BSD") cores="$(sysctl -n hw.ncpu)" ;; "Solaris") cores="$(kstat -m cpu_info | grep -c -F "chip_id")" ;; + "Haiku") cores="$(sysinfo -cpu | grep -c -F 'CPU #')" ;; "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; esac fi