efelon/shell_sequencer
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Make use of echoerr to send error messages to stderr

Browse Source
This commit is contained in:
Martin Winkler
2019-11-22 21:08:05 +01:00
parent 78de3db626
commit d89dd8e6ab
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sequencer/sequencer.sh
View File

@@ -49,6 +49,9 @@ helpSequencer() {
echo " \$1 is always the step number"
}
# Echo to stderr
echoerr() { >&2 echo "$@"; }
# endCheckEmpty [VariableName] [DESCRIPTION]
# DESCRIPTION : Optional text for error
endCheckEmpty() {
@@ -59,7 +62,7 @@ endCheckEmpty() {
errorText=$2
fi
if [ -z $ref ] ; then
echo -e " [E] $errorText must not be empty.\n Sequence stopped."
echoerr -e " [E] $errorText must not be empty.\n Sequence stopped."
exit 666
fi
}
@@ -113,18 +116,18 @@ endReturn() {
if [[ ( $ERNO -ne 0 && $QUIET -ne 0 ) || ( $ERNO -ne 0 && $forceExit -ne 0 ) ]] ; then
echo
if [ "$endMessage" != "" ]; then
echo -e " [E] $endMessage\n Sequence stopped"
echoerr -e " [E] $endMessage\n Sequence stopped"
else
echo -e " [E] Return value $ERNO detected.\n Sequence stopped"
echoerr -e " [E] Return value $ERNO detected.\n Sequence stopped"
fi
exit $ERNO
fi
if [ $ERNO -ne 0 ] ; then
echo
if [ "$endMessage" != "" ]; then
echo -e " [W] $endMessage"
echoerr -e " [W] $endMessage"
else
echo " [W] Return value $ERNO detected."
echoerr " [W] Return value $ERNO detected."
fi
read -p "End sequence: [y]/n? " answer
case $answer in
@@ -134,7 +137,7 @@ endReturn() {
;;
*)
echo
echo " [E] Sequence stopped"
echoerr " [E] Sequence stopped"
exit $ERNO;
;;
esac
@@ -285,7 +288,7 @@ checkStep() {
eval 'ref=$alias_'"$1"
# Catch special character after eval
if ! [[ "$ref" =~ $rex ]] ; then
echo " [E] Invalid step: $1"
echoerr " [E] Invalid step: $1"
ref=0
fi
else
@@ -525,18 +528,18 @@ main() {
# compatibility check of sequence
if [ ! -z $VERSION_SEQREV ] && [ $VERSION_SEQREV -gt $VERSION_REV ] ; then
echo " [E] Unsupported sequence revision"
echoerr " [E] Unsupported sequence revision"
showVersion
exit 1
fi
# exclude older versions if needed
if [ ! -z $VERSION_SEQREV ] && [ $VERSION_SEQREV -lt 3 ] ; then
echo " [E] Unsupported sequence revision (addConf)"
echoerr " [E] Unsupported sequence revision (addConf)"
showVersion
exit 1
fi
if [ -z $VERSION_SEQREV ] ; then
echo -e " [W] No sequence revision found. Trying anyway...\n";
echoerr -e " [W] No sequence revision found. Trying anyway...\n";
fi
# check for starting step