From ab514210d296c2029e72c06674f56cfd9e1bc2b4 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Thu, 30 Dec 2021 14:58:11 -0300 Subject: [PATCH] Fix bugs --- install.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index 46ca113..d75aeaf 100755 --- a/install.sh +++ b/install.sh @@ -205,9 +205,13 @@ networkConf() { calcWidthAndRun() { width=$(echo "$@" | grep -oP '(?<=").*?(?=")' | wc -c) - toReturn=$(eval $(echo "$@" | sed "s/WIDTH/$((${width}+8))/g")) + 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=$? - echo $toReturn + [ ! -z $commOutput ] && echo $commOutput return $exitStatus } @@ -219,9 +223,13 @@ calcHeightAndRun() { x = (($1 - $2 + ($2 * 60)) / 60) printf "%d", (x == int(x)) ? x : int(x) + 1 }') - toReturn=$(eval $(echo "$@" | sed "s/HEIGHT/$((5+$height))/g")) + 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=$? - echo $toReturn + [ ! -z $commOutput ] && echo $commOutput return $exitStatus }