Merge pull request #608 from tippl/fix_load_segment

Fix average selection in load segment.

powerlevel9k.zsh-theme

@@ -932,13 +932,14 @@ prompt_vpn_ip() {
   done
 }
 
+set_default POWERLEVEL9K_LOAD_WHICH 5
 prompt_load() {
   # The load segment can have three different states
   local current_state="unknown"
+  local load_select=2
+  local load_avg
   local cores
 
-  set_default POWERLEVEL9K_LOAD_WHICH 5
-
   typeset -AH load_states
   load_states=(
     'critical'      'red'
@@ -946,32 +947,38 @@ prompt_load() {
     'normal'        'green'
   )
 
-  if [[ "$OS" == "OSX" ]] || [[ "$OS" == "BSD" ]]; then
-
-    if [[ "$POWERLEVEL9K_LOAD_WHICH" -eq 1 ]]; then
-     load_avg=$(sysctl vm.loadavg | grep -o -E '[0-9]+(\.|,)[0-9]+' | head -n 3 | sed -n 1p)
-    elif [[ "$POWERLEVEL9K_LOAD_WHICH" -eq 5 ]]; then
-     load_avg=$(sysctl vm.loadavg | grep -o -E '[0-9]+(\.|,)[0-9]+' | head -n 3 | sed -n 2p)
-    else
-     load_avg=$(sysctl vm.loadavg | grep -o -E '[0-9]+(\.|,)[0-9]+' | head -n 3 | sed -n 3p)
-    fi
+  case "$POWERLEVEL9K_LOAD_WHICH" in
+    1)
+      load_select=1
+      ;;
+    5)
+      load_select=2
+      ;;
+    15)
+      load_select=3
+      ;;
+  esac
 
-    if [[ "$OS" == "OSX" ]]; then
-      cores=$(sysctl -n hw.logicalcpu)
-    else
-      cores=$(sysctl -n hw.ncpu)
-    fi
-  else
-    load_avg=$(grep -o "[0-9.]*" /proc/loadavg | head -n 1)
-    cores=$(nproc)
-  fi
+  case "$OS" in
+    OSX|BSD)
+      load_avg=$(sysctl vm.loadavg | grep -o -E '[0-9]+(\.|,)[0-9]+' | sed -n ${load_select}p)
+      if [[ "$OS" == "OSX" ]]; then
+        cores=$(sysctl -n hw.logicalcpu)
+      else
+        cores=$(sysctl -n hw.ncpu)
+      fi
+      ;;
+    *)
+      load_avg=$(cut -d" " -f${load_select} /proc/loadavg)
+      cores=$(nproc)
+  esac
 
   # Replace comma
   load_avg=${load_avg//,/.}
 
   if [[ "$load_avg" -gt $(bc -l <<< "${cores} * 0.7") ]]; then
     current_state="critical"
-elif [[ "$load_avg" -gt $(bc -l <<< "${cores} * 0.5") ]]; then
+  elif [[ "$load_avg" -gt $(bc -l <<< "${cores} * 0.5") ]]; then
     current_state="warning"
   else
     current_state="normal"