Consolidated if statements and fixed OSX cpu cores command
This commit is contained in:
parent
78b4ab0414
commit
d2728f0dd1
|
@ -580,12 +580,6 @@ prompt_load() {
|
||||||
local current_state="unknown"
|
local current_state="unknown"
|
||||||
local cores
|
local cores
|
||||||
|
|
||||||
if [[ "$OS" == "OSX" ]]; then
|
|
||||||
cores=$(sysctl -a | grep machdep.cpu)
|
|
||||||
else
|
|
||||||
cores=$(nproc)
|
|
||||||
fi
|
|
||||||
|
|
||||||
typeset -AH load_states
|
typeset -AH load_states
|
||||||
load_states=(
|
load_states=(
|
||||||
'critical' 'red'
|
'critical' 'red'
|
||||||
|
@ -595,8 +589,10 @@ prompt_load() {
|
||||||
|
|
||||||
if [[ "$OS" == "OSX" ]]; then
|
if [[ "$OS" == "OSX" ]]; then
|
||||||
load_avg_1min=$(sysctl vm.loadavg | grep -o -E '[0-9]+(\.|,)[0-9]+' | head -n 1)
|
load_avg_1min=$(sysctl vm.loadavg | grep -o -E '[0-9]+(\.|,)[0-9]+' | head -n 1)
|
||||||
|
cores=$(sysctl -n hw.physicalcpu)
|
||||||
else
|
else
|
||||||
load_avg_1min=$(grep -o "[0-9.]*" /proc/loadavg | head -n 1)
|
load_avg_1min=$(grep -o "[0-9.]*" /proc/loadavg | head -n 1)
|
||||||
|
cores=$(nproc)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Replace comma
|
# Replace comma
|
||||||
|
|
Loading…
Reference in New Issue