added file dependency check, switched back to english, smaller fix and improvements
This commit is contained in:
@@ -19,12 +19,12 @@ function die()
|
||||
trap - ERR
|
||||
|
||||
if [[ "$KEEPGOING" != "true" ]] || [[ "$2" == "--force" ]]; then
|
||||
prnt E "Sortie prématuré avec erreur (code #$errorcode)."
|
||||
prnt E "Premature exit with error (code #$errorcode)."
|
||||
# We remove KEEPGOING in case of --force so error() behave correctly
|
||||
export KEEPGOING=false
|
||||
exit $errorcode
|
||||
else
|
||||
prnt W "On continue malgrés l'erreur #$errorcode."
|
||||
prnt W "Continuing despite error #$errorcode."
|
||||
fi
|
||||
unset errorcode
|
||||
|
||||
@@ -38,7 +38,7 @@ export -f die
|
||||
# Function trigered on Ctrl+C pressed or external kill affecting us
|
||||
function terminate()
|
||||
{
|
||||
prnt E "$1 reçu, sortie immédiate."
|
||||
prnt E "$1 recieved, exiting at once."
|
||||
die 128 --force
|
||||
}
|
||||
trap "terminate 'Ctrl + C'" SIGINT
|
||||
@@ -54,13 +54,13 @@ function error()
|
||||
local code="${3:-1}"
|
||||
|
||||
# Print error header
|
||||
prnt E "${BIWhite}*** ${BIRed}Une erreur fatale est intervenue, le script va s'arrêter immédiatement !$DEFAULTCOL"
|
||||
prnt E "${BIWhite}*** ${BIRed}A fatal error occured, the script will stop now!$DEFAULTCOL"
|
||||
|
||||
if [[ -n "$message" ]]; then
|
||||
prnt E "Erreur ligne $parent_lineno, code d'erreur $code avec le message :"
|
||||
prnt E "Error line $parent_lineno, code $code with message:"
|
||||
echo -e "\t\t$message"
|
||||
else
|
||||
prnt E "Erreur ligne $(caller), avec le code d'erreur $code."
|
||||
prnt E "Error ligne $(caller), with error code $code."
|
||||
fi
|
||||
unset parent_lineno message code
|
||||
}
|
||||
@@ -85,7 +85,7 @@ function err_exit
|
||||
# Print a backtrace
|
||||
function backtrace
|
||||
{
|
||||
echo "======== Pile d'appel ========"
|
||||
echo "========= Call stack ========="
|
||||
typeset -i i=0
|
||||
|
||||
local func=
|
||||
@@ -134,7 +134,7 @@ check_root()
|
||||
return 0
|
||||
fi
|
||||
if [[ $EUID -ne 0 ]]; then
|
||||
prnt E "Ce script doit être démarré en tant que root. Arrêt."
|
||||
prnt E "That script must be run with root privileges."
|
||||
die 4 --force
|
||||
fi
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user