From f714911ae0c0d7c97351fae95b7f17a41b4c5b75 Mon Sep 17 00:00:00 2001 From: alanw Date: Thu, 11 May 2023 10:45:37 -0700 Subject: [PATCH] v1.3.0 - expanded logging --- functions | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/functions b/functions index 96f86ad..4c6f671 100644 --- a/functions +++ b/functions @@ -2,7 +2,7 @@ # pyr0ball script functions library # Initial Vars -functionsrev=1.2.1 +functionsrev=1.3.0 #scriptname="${BASH_SOURCE[0]##*/}" #rundir="${BASH_SOURCE[0]%/*}" #rundir_absolute=$(cd $rundir && pwd) @@ -320,8 +320,14 @@ boxbottom() { echo } -boxline() { - logger echo -e "$left_border $1\r${ESC}[${BOXWIDTH}C$right_border" +boxlinelog() { + local _cmd=${@:1} + #echo -e "$left_border $(logger echo -e "${1}")\r${ESC}[${BOXWIDTH}C$right_border" + logger echo -e "$left_border $_cmd\r${ESC}[${BOXWIDTH}C$right_border" +} + +boxline(){ + echo -e "$left_border $1\r${ESC}[${BOXWIDTH}C$right_border" } boxseparator(){ @@ -337,6 +343,18 @@ boxborder(){ boxbottom } +boxborderlog(){ + local _cmd=() + boxtop + for line in "$@" ; do + _cmd+=("$line") + done + for line in ${_cmd[@]} ; do + boxlinelog "$line" + done + boxbottom +} + subboxborder(){ BOXWIDTH_ORG=$BOXWIDTH BOXWIDTH=$(($BOXWIDTH*75/100))