fixed some issue on error treatment, some typo

This commit is contained in:
root
2021-06-25 12:17:55 +02:00
parent 7096fd11b7
commit d7e0646875
2 changed files with 29 additions and 16 deletions

View File

@@ -4,14 +4,19 @@
function die()
{
local errorcode=$1
[[ $2 == "--force" ]] && unset KEEPGOING
if [[ $KEEPGOING ]]; then
# Don't trigger the ERR signal as we already managed the error
trap - ERR
if [[ "$KEEPGOING" != "true" || "$2" == "--force" ]]; then
prnt E "Sortie prématuré avec erreur (code #$errorcode)."
exit $errorcode
else
prnt W "On continue malgrés l'erreur #$errorcode."
fi
# Put the trigger back (only executed with --keepgoing)
trap "error ${LINENO}" ERR
}
export -f die
@@ -40,7 +45,7 @@ function error()
# Print error header
prnt E "${BIWhite}*** ${BIRed}Une erreur fatale est intervenue, \
le script va s'arrêter immédiatement !$DEFAULTCOL"
le script va s'arrêter immédiatement !$DEFAULTCOL"
# Print backtrace
backtrace 2