From a66db88e423fdb187a7a5f3da190461937138aa0 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 12 Jan 2024 08:31:13 -0600 Subject: [PATCH] Update default.inc --- default.inc | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/default.inc b/default.inc index 7d1fb50..d459d2f 100755 --- a/default.inc +++ b/default.inc @@ -145,6 +145,26 @@ ROUND_NUMBER(){ *) echo $(echo $1 | awk '{printf "%.0f\n", $1}');; esac } +IDS_NUMBER_FORMAT(){ + VAL=${1} + [ "${2}" == "" ] && DEC=2 || DEC=${2} + ShowDecAlways=${3} + # ShowDecAlways=yes + + if [ "${ShowDecAlways}" != "" ]; then + echo `printf "%'.${DEC}f\n" ${VAL}` + + elif [ "${DEC}" == "0" ]; then + echo `printf "%'.0f\n" ${VAL}` + + elif [[ "${VAL}" == *"."* ]] && [[ "${VAL}" != *".0"* ]]; then + echo `printf "%'.${DEC}f\n" ${VAL}` + + else + echo `printf "%'.0f\n" ${VAL}` + + fi +} SHOW_TIME() { num=$(ROUND_NUMBER ${1}) min=0; hour=0; day=0 @@ -294,27 +314,6 @@ function arr_count() { echo ${#r[@]} } -IDS_NUMBER_FORMAT(){ - VAL=${1} - [ "${2}" == "" ] && DEC=2 || DEC=${2} - ShowDecAlways=${3} - # ShowDecAlways=yes - - if [ "${ShowDecAlways}" != "" ]; then - echo `printf "%'.${DEC}f\n" ${VAL}` - - elif [ "${DEC}" == "0" ]; then - echo `printf "%'.0f\n" ${VAL}` - - elif [[ "${VAL}" == *"."* ]] && [[ "${VAL}" != *".0"* ]]; then - echo `printf "%'.${DEC}f\n" ${VAL}` - - else - echo `printf "%'.0f\n" ${VAL}` - - fi -} - GET_CPU_USAGE(){ CPU_USAGE=$(awk '{u=$2+$4; t=$2+$4+$5; if (NR==1){u1=u; t1=t;} else print ($2+$4-u1) * 100 / (t-t1) "%"; }' <(grep 'cpu ' /proc/stat) <(sleep 1;grep 'cpu ' /proc/stat) | sed -e 's/%//g') echo ${CPU_USAGE}