fatalerrors/init.sh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added noerror function to execute stuff outside of error control system

Browse Source
This commit is contained in:
levasseur
2021-09-08 18:11:24 +02:00
parent d8c1dfddd6
commit 9aa7244824
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/aaa_errors.sh
View File

@@ -81,6 +81,20 @@ function backtrace
} }
# ------------------------------------------------------------------------------
# Execute command outside of error control
noerror()
{
set +o errexit
trap - ERR
$@
trap "error ${LINENO}" ERR
set -o errexit
}
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Test and exit if not root (or any UID 0 user) # Test and exit if not root (or any UID 0 user)
check_root() check_root()

2
modules/upgrade_dist.sh
View File

@@ -47,7 +47,7 @@ upgrade_dist()
precheck_upgrade_dist() precheck_upgrade_dist()
{ {
prnt I "Vérification du réseau..." prnt I "Vérification du réseau..."
wget -q --tries=10 --timeout=20 --spider http://www.cnrs.fr noerror wget -q --tries=10 --timeout=20 --spider http://www.cnrs.fr
if [[ ! $? -eq 0 ]]; then if [[ ! $? -eq 0 ]]; then
prnt E "Réseau non fonctionnel ! Abandon." prnt E "Réseau non fonctionnel ! Abandon."
die 160 die 160