Added new info function 'cpu usage' to get the cpu usage

This commit is contained in:
Dylan 2016-03-03 10:37:18 +11:00
parent d142efe2db
commit da5d912774
2 changed files with 34 additions and 4 deletions

View file

@ -224,11 +224,19 @@ prompt_height=1
# --progress_char char # --progress_char char
progress_char="━" progress_char="━"
# Progress bar length in spaces
# Number of chars long to make the progress bars.
# --progress_length num
progress_length="15"
# Progress bar colors # Progress bar colors
# --progress_colors col col # --progress_colors col col
progress_color_elapsed="6" progress_color_elapsed="6"
progress_color_total="8" progress_color_total="8"
# Cpu Usage progress bar
cpu_usage_bar="on"
# }}} # }}}

View file

@ -63,6 +63,8 @@ printinfo () {
# info "Users" users # info "Users" users
# info "Birthday" birthday # info "Birthday" birthday
# info "CPU Usage" cpu_usage
info linebreak info linebreak
info cols info cols
info linebreak info linebreak
@ -244,11 +246,19 @@ prompt_height=1
# --progress_char char # --progress_char char
progress_char="━" progress_char="━"
# Progress bar length in spaces
# Number of chars long to make the progress bars.
# --progress_length num
progress_length="15"
# Progress bar colors # Progress bar colors
# --progress_colors col col # --progress_colors col col
progress_color_elapsed="6" progress_color_elapsed="6"
progress_color_total="8" progress_color_total="8"
# Cpu Usage progress bar
cpu_usage_bar="on"
# }}} # }}}
@ -1583,6 +1593,18 @@ getcols () {
# }}} # }}}
# CPU Usage {{{
getcpu_usage () {
cpu_usage="$(ps aux | awk 'BEGIN { sum = 0 } { sum += $3 }; END { print sum }')"
cpu_usage="${cpu_usage/\.*}%"
[ "$cpu_usage_bar" == "on" ] && \
cpu_usage+=" $(bar "${cpu_usage/'%'}")"
}
# }}}
# }}} # }}}
@ -2247,12 +2269,11 @@ esac
bar() { bar() {
# Get the values # Get the values
percent="$1" percent="$1"
length="$2" elapsed=$((percent * progress_length / 100))
inc=$((percent * length / 100))
# Create the bar with spaces # Create the bar with spaces
prog=$(printf %"$inc"s) prog=$(printf %"$elapsed"s)
total=$(printf %"$((length - inc))"s) total=$(printf %"$((progress_length - elapsed))"s)
# Set the colors and swap the spaces for $progress_char # Set the colors and swap the spaces for $progress_char
bar="\033[38;5;${progress_color_elapsed}m${prog// /$progress_char}" bar="\033[38;5;${progress_color_elapsed}m${prog// /$progress_char}"
@ -2439,6 +2460,7 @@ while [ "$1" ]; do
# Progress Bars # Progress Bars
--progress_char) progress_char="$2" ;; --progress_char) progress_char="$2" ;;
--progress_length) progress_length="$2" ;;
--progress_colors) --progress_colors)
progress_color_elapsed="$2" progress_color_elapsed="$2"
progress_color_total="$3" progress_color_total="$3"