From 71d4009cccac97bfe6f0ba5357740dd8427d8e9c Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@unibe.ch>
Date: Mon, 11 Mar 2024 15:16:03 +0100
Subject: [PATCH] exit if source of a file failed
---
backup.sh | 4 ++--
detector.sh | 4 ++--
localdump.sh | 10 +++++-----
restore.sh | 4 ++--
transfer.sh | 4 ++--
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/backup.sh b/backup.sh
index 61ad863..77fde66 100755
--- a/backup.sh
+++ b/backup.sh
@@ -17,8 +17,8 @@
# 2022-11-04 ah v1.2 rename hooks
# ================================================================================
-. $( dirname "$0" )/includes/jobhelper.sh
-. `dirname $0`/includes/inc_bash.sh
+. $( dirname "$0" )/includes/jobhelper.sh || exit 1
+. $(dirname $0)/includes/inc_bash.sh || exit 1
typeset -i rcBackup=0
typeset -i rcTransfer=0
diff --git a/detector.sh b/detector.sh
index 2eca8cf..f789b4f 100755
--- a/detector.sh
+++ b/detector.sh
@@ -8,12 +8,12 @@
# 2024-02-xx v0.1 ah Initial version
# --------------------------------------------------------------------
-cd $( dirname $0 )
+cd $( dirname $0 ) || exit 1
. vendor/ini.class.sh || exit 1
. vendor/color.class.sh || exit 1
-. $(dirname $0)/includes/dbdetect.class.sh
+. $(dirname $0)/includes/dbdetect.class.sh || exit 1
DBD_DEBUG=0
showInfos=0
diff --git a/localdump.sh b/localdump.sh
index 9d830a1..d2881dc 100755
--- a/localdump.sh
+++ b/localdump.sh
@@ -31,13 +31,13 @@
# CONFIG VARS
# ----------------------------------------------------------------------
- . $(dirname $0)/vendor/ini.class.sh
- . $(dirname $0)/vendor/color.class.sh
+ . $(dirname $0)/vendor/ini.class.sh || exit 1
+ . $(dirname $0)/vendor/color.class.sh || exit 1
- . $(dirname $0)/includes/jobhelper.sh
- . $(dirname $0)/includes/inc_bash.sh | exit 1
+ . $(dirname $0)/includes/jobhelper.sh || exit 1
+ . $(dirname $0)/includes/inc_bash.sh || exit 1
- . $(dirname $0)/includes/dbdetect.class.sh
+ . $(dirname $0)/includes/dbdetect.class.sh || exit 1
# if [ -r ~/.backup.conf ]; then
# . ~/.backup.conf
diff --git a/restore.sh b/restore.sh
index 713adad..0345979 100755
--- a/restore.sh
+++ b/restore.sh
@@ -33,8 +33,8 @@
# . `dirname $0`/inc_config.sh
- . $(dirname $0)/includes/jobhelper.sh
- . $(dirname $0)/includes/inc_bash.sh
+ . $(dirname $0)/includes/jobhelper.sh || exit 1
+ . $(dirname $0)/includes/inc_bash.sh || exit 1
# --- load a transfer plugin
STORAGE_BIN=$(_j_getvar ${STORAGEFILE} "bin")
diff --git a/transfer.sh b/transfer.sh
index 9aa8335..c313fcf 100755
--- a/transfer.sh
+++ b/transfer.sh
@@ -48,8 +48,8 @@
# . `dirname $0`/inc_config.sh
- . $(dirname $0)/includes/jobhelper.sh
- . $(dirname $0)/includes/inc_bash.sh
+ . $(dirname $0)/includes/jobhelper.sh || exit 1
+ . $(dirname $0)/includes/inc_bash.sh || exit 1
typeset -i rc=0
typeset -i doBackup=1
--
GitLab