From 1be5423b1ddb62e07a231bc177e8b53188ecd802 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 13 Jun 2016 21:21:32 +1000 Subject: [PATCH] Fix usage on BSD --- neofetch | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index c85e59b0..8a0f4c04 100755 --- a/neofetch +++ b/neofetch @@ -1161,28 +1161,23 @@ getcpu () { getcpu_usage () { case "$os" in - "Linux" | "Mac OS X" | "iPhone OS") - # Get cores if unset - if [ -z "$cores" ]; then - case "$os" in - "Linux") cores="$(awk -F ': ' '/siblings/ {printf $2; exit}' /proc/cpuinfo)" ;; - "Mac OS X") cores="$(sysctl -n hw.ncpu)" ;; - esac - fi - - cpu_usage="$(ps aux | awk 'BEGIN { sum = 0 } { sum += $3 }; END { print sum }')" - cpu_usage="$((${cpu_usage/\.*} / ${cores:-1}))" - ;; - "Windows") cpu_usage="$(wmic cpu get loadpercentage /value)" cpu_usage="${cpu_usage/LoadPercentage'='}" cpu_usage="${cpu_usage//[[:space:]]}" ;; - "BSD") - # BSD support coming soon. - return + "Linux" | "Mac OS X" | "iPhone OS" | "BSD") + # Get cores if unset + if [ -z "$cores" ]; then + case "$os" in + "Linux") cores="$(awk -F ': ' '/siblings/ {printf $2; exit}' /proc/cpuinfo)" ;; + "Mac OS X" | "BSD") cores="$(sysctl -n hw.ncpu)" ;; + esac + fi + + cpu_usage="$(ps aux | awk 'BEGIN { sum = 0 } { sum += $3 }; END { print sum }')" + cpu_usage="$((${cpu_usage/\.*} / ${cores:-1}))" ;; esac