From c3b0cd0d820e118844bb9b3d728cb1cb063db9d0 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 26 Apr 2023 21:02:45 -0500 Subject: [PATCH] Update dsmon.sh --- dsmon.sh | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/dsmon.sh b/dsmon.sh index d36e335..e587d81 100755 --- a/dsmon.sh +++ b/dsmon.sh @@ -176,20 +176,11 @@ CHECK(){ # echo if [ "${1}" != "report" ]; then - c=0; cw=20; spcA='' - spc1=`expr ${cw} - 7` - until [ $c = ${spc1} ]; do spcA="${spcA} "; c=`expr $c + 1`; done - c=0; cw=10; spcB='' - spc2=`expr ${cw} - 4` - until [ $c = ${spc2} ]; do spcB="${spcB} "; c=`expr $c + 1`; done - c=0; cw=10; spcC='' - spc3=`expr ${cw} - 5` - until [ $c = ${spc3} ]; do spcC="${spcC} "; c=`expr $c + 1`; done - c=0; cw=16; spcD='' - spc4=`expr ${cw} - 3` - until [ $c = ${spc4} ]; do spcD="${spcD} "; c=`expr $c + 1`; done + c=0; cw=18; spcA=''; spc1=`expr ${cw} - 7`; until [ $c = ${spc1} ]; do spcA="${spcA} "; c=`expr $c + 1`; done + c=0; cw=10; spcB=''; spc2=`expr ${cw} - 4`; until [ $c = ${spc2} ]; do spcB="${spcB} "; c=`expr $c + 1`; done + c=0; cw=10; spcC=''; spc3=`expr ${cw} - 5`; until [ $c = ${spc3} ]; do spcC="${spcC} "; c=`expr $c + 1`; done + c=0; cw=14; spcD=''; spc4=`expr ${cw} - 3`; until [ $c = ${spc4} ]; do spcD="${spcD} "; c=`expr $c + 1`; done echo -e "${idsST[Reset]}${idsCL[White]} DRIVE${spcA} FREE GB${spcB}FREE %${spcC}TOTAL GB${spcD}WARN % / CRIT %${idsCL[Default]}" - # pf="%-20s %10s %10s %12s %50s\n" # printf "${pf}" "${idsCLf[White]}DRIVE" "FREE GB" "FREE %" "TOTAL GB" "WARN % / CRIT %${idsCLf[Default]}" fi @@ -202,10 +193,10 @@ CHECK(){ CRITICAL_LEVEL=$(printf "%0.2f" $(jq -n $WARNING_LEVEL-$WARNING_LEVEL/2)) if [ "${1}" != "report" ]; then - c=0; cw=20; spcA=''; spc1=`expr ${cw} - ${#DRIVEINFO_SHORTNAME[$DRIVE]}`; until [ $c = ${spc1} ]; do spcA="${spcA} "; c=`expr $c + 1`; done + c=0; cw=18; spcA=''; spc1=`expr ${cw} - ${#DRIVEINFO_SHORTNAME[$DRIVE]}`; until [ $c = ${spc1} ]; do spcA="${spcA} "; c=`expr $c + 1`; done c=0; cw=10; spcB=''; spc2=`expr ${cw} - ${#DRIVEINFO_FREE[$DRIVE]}`; until [ $c = ${spc2} ]; do spcB="${spcB} "; c=`expr $c + 1`; done c=0; cw=10; spcC=''; spc3=`expr ${cw} - ${#DRIVEINFO_FREEPER[$DRIVE]}`; until [ $c = ${spc3} ]; do spcC="${spcC} "; c=`expr $c + 1`; done - c=0; cw=16; spcD=''; spc4=`expr ${cw} - ${#DRIVEINFO_TOT[$DRIVE]}`; until [ $c = ${spc4} ]; do spcD="${spcD} "; c=`expr $c + 1`; done + c=0; cw=14; spcD=''; spc4=`expr ${cw} - ${#DRIVEINFO_TOT[$DRIVE]}`; until [ $c = ${spc4} ]; do spcD="${spcD} "; c=`expr $c + 1`; done fi if (( $(bc <<<"${DRIVEINFO_FREEPER[$DRIVE]} <= ${CRITICAL_LEVEL}") )); then