From 0c6f2c1513885e8582e29c4758b8a730daf6d131 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 29 Nov 2023 22:37:35 -0600 Subject: [PATCH] Update default.inc --- default.inc | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/default.inc b/default.inc index 5cb29ed..6d264c6 100755 --- a/default.inc +++ b/default.inc @@ -287,9 +287,23 @@ function arr_count() { IDS_NUMBER_FORMAT(){ VAL=${1} - DEC=${2} - [ "${DEC}" == "" ] && DEC=2 - [[ "${VAL}" == *"."* ]] && [[ "${VAL}" != *".0"* ]] && echo `printf "%'.${DEC}f\n" ${VAL}` || echo `printf "%'.0f\n" ${VAL}` + [ "${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 }