Return exit status in calcWidthAndRun() and calcHeightAndRun()
This commit is contained in:
parent
962b795308
commit
40137ed07c
10
install.sh
10
install.sh
|
@ -205,7 +205,10 @@ networkConf() {
|
||||||
|
|
||||||
calcWidthAndRun() {
|
calcWidthAndRun() {
|
||||||
width=$(echo "$@" | grep -oP '(?<=").*?(?=")' | wc -c)
|
width=$(echo "$@" | grep -oP '(?<=").*?(?=")' | wc -c)
|
||||||
echo $(eval $(echo "$@" | sed "s/WIDTH/$((${width}+8))/g"))
|
toReturn=$(eval $(echo "$@" | sed "s/WIDTH/$((${width}+8))/g"))
|
||||||
|
exitStatus=$?
|
||||||
|
echo $toReturn
|
||||||
|
return $exitStatus
|
||||||
}
|
}
|
||||||
|
|
||||||
calcHeightAndRun() {
|
calcHeightAndRun() {
|
||||||
|
@ -216,7 +219,10 @@ calcHeightAndRun() {
|
||||||
x = (($1 - $2 + ($2 * 60)) / 60)
|
x = (($1 - $2 + ($2 * 60)) / 60)
|
||||||
printf "%d", (x == int(x)) ? x : int(x) + 1
|
printf "%d", (x == int(x)) ? x : int(x) + 1
|
||||||
}')
|
}')
|
||||||
echo $(eval $(echo "$@" | sed "s/HEIGHT/$((5+$height))/g"))
|
toReturn=$(eval $(echo "$@" | sed "s/HEIGHT/$((5+$height))/g"))
|
||||||
|
exitStatus=$?
|
||||||
|
echo $toReturn
|
||||||
|
return $exitStatus
|
||||||
}
|
}
|
||||||
|
|
||||||
askForPassword() {
|
askForPassword() {
|
||||||
|
|
Loading…
Reference in New Issue