From 59939502fd5075d66309f7bbff94d9ea7b868ae4 Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <santilococo.01@gmail.com>
Date: Thu, 30 Dec 2021 21:25:44 -0300
Subject: [PATCH] Update dynamic calculations

---
 scripts/common.sh | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index bbfb48f..42454a9 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -20,37 +20,25 @@ useDialog() {
 }
 
 useWhiptail() {
-    whiptail "$@" 0 0
-}
-
-calcWidthAndRun() {
-    width=$(echo "$@" | grep -oP '(?<=").*?(?=")' | wc -c)
-    comm=$(echo "$@" | sed "s/WIDTH/$((${width}+8))/g")
-    if [[ $comm != *"3>&1 1>&2 2>&3" ]]; then
-        comm="${comm} 3>&1 1>&2 2>&3"
-    fi
-    commOutput=$(eval $comm)
-    exitStatus=$?
-    [ ! -z $commOutput ] && echo $commOutput
-    return $exitStatus
-}
-
-calcHeightAndRun() {
     str=$(echo "$@" | grep -oP '(?<=").*?(?=")')
+    width=$(calcWidth "$str")
+    height=$(calcHeight "$str")
+    whiptail "$@" ${height} ${width}
+}
+
+calcWidth() {
+    width=$(echo "$str" | wc -c)
+    echo $((${width}+8))
+}
+
+calcHeight() {
     newlines=$(printf "$str" | grep -c $'\n')
     chars=$(echo "$str" | wc -c)
     height=$(echo "$chars" "$newlines" | awk '{
         x = (($1 - $2 + ($2 * 60)) / 60)
         printf "%d", (x == int(x)) ? x : int(x) + 1
     }')
-    comm=$(echo "$@" | sed "s/HEIGHT/$((5+$height))/g")
-    if [[ $comm != *"3>&1 1>&2 2>&3" ]]; then
-        toRun="${comm} 3>&1 1>&2 2>&3"
-    fi
-    commOutput=$(eval $comm)
-    exitStatus=$?
-    [ ! -z $commOutput ] && echo $commOutput
-    return $exitStatus
+    echo $((5+${height}))
 }
 
 setDialogBox() {