From 91f9f8a8da35d77bf706546e0a4e30d7341385ca Mon Sep 17 00:00:00 2001 From: Martin Winkler Date: Fri, 13 Dec 2019 23:47:02 +0100 Subject: [PATCH] endCheckEmpty uses full DESCRIPTION as error message, if available --- sequencer/sequencer.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sequencer/sequencer.sh b/sequencer/sequencer.sh index d461e7b..cfd40f3 100755 --- a/sequencer/sequencer.sh +++ b/sequencer/sequencer.sh @@ -128,14 +128,14 @@ echoerr() { >&2 echo "$@"; } # endCheckEmpty [DESCRIPTION] # DESCRIPTION : Optional text for error endCheckEmpty() { - local errorText=$1 eval 'local ref=$'$1 - if [ ! -z "$2" ] ; then - errorText=$2 - fi if [ -z $ref ] ; then - echoerr -e " [E] $errorText must not be empty.\n Sequence stopped." + if [ ! -z "$2" ] ; then + echoerr -e " [E] $2\n Sequence stopped." + else + echoerr -e " [E] $1 must not be empty.\n Sequence stopped." + fi exit 666 fi }