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