From 42ce0ba29784781549bea6cb67bec105d5dbe8b5 Mon Sep 17 00:00:00 2001 From: Stephan Wendel Date: Tue, 18 Apr 2023 17:21:30 +0200 Subject: [PATCH] fix: fix error not exiting script on error Signed-off-by: Stephan Wendel --- crowsnest | 2 +- libs/camera-streamer.sh | 2 +- libs/configparser.sh | 2 +- libs/core.sh | 2 +- libs/hwhandler.sh | 2 +- libs/init_stream.sh | 2 +- libs/logging.sh | 2 +- libs/messages.sh | 2 +- libs/ustreamer.sh | 2 +- libs/v4l2_control.sh | 2 +- libs/versioncontrol.sh | 2 +- libs/watchdog.sh | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/crowsnest b/crowsnest index 1454fa0..51a5e90 100755 --- a/crowsnest +++ b/crowsnest @@ -14,7 +14,7 @@ # shellcheck enable=require-variable-braces # Exit upon Errors -set -Ee +set -Eeou # Base Path BASE_CN_PATH="$(dirname "$(readlink -f "${0}")")" diff --git a/libs/camera-streamer.sh b/libs/camera-streamer.sh index 885557d..5336be6 100755 --- a/libs/camera-streamer.sh +++ b/libs/camera-streamer.sh @@ -14,7 +14,7 @@ # shellcheck enable=require-variable-braces # Exit upon Errors -set -Ee +set -Eeou function run_multi() { local cams diff --git a/libs/configparser.sh b/libs/configparser.sh index 60acb80..0da207c 100755 --- a/libs/configparser.sh +++ b/libs/configparser.sh @@ -14,7 +14,7 @@ # shellcheck enable=require-variable-braces # Exit upon Errors -set -Ee +set -Eeou # Read Configuration File # call get_param section param diff --git a/libs/core.sh b/libs/core.sh index 6d54a3b..b18a983 100755 --- a/libs/core.sh +++ b/libs/core.sh @@ -14,7 +14,7 @@ # shellcheck enable=require-variable-braces # Exit upon Errors -set -Ee +set -Eeou ## Version of crowsnest function self_version { diff --git a/libs/hwhandler.sh b/libs/hwhandler.sh index 543a6d4..59224a9 100755 --- a/libs/hwhandler.sh +++ b/libs/hwhandler.sh @@ -14,7 +14,7 @@ # shellcheck enable=require-variable-braces # Exit upon Errors -set -Ee +set -Eeou ### Detect Hardware detect_avail_cams() { diff --git a/libs/init_stream.sh b/libs/init_stream.sh index 40edd19..dd9d38d 100755 --- a/libs/init_stream.sh +++ b/libs/init_stream.sh @@ -14,7 +14,7 @@ # shellcheck enable=require-variable-braces # Exit upon Errors -set -Ee +set -Eeou ## Start Stream Service # sleep to prevent cpu cycle spikes diff --git a/libs/logging.sh b/libs/logging.sh index 43a38ce..66cbfd6 100755 --- a/libs/logging.sh +++ b/libs/logging.sh @@ -14,7 +14,7 @@ # shellcheck enable=require-variable-braces # Exit upon Errors -set -Ee +set -Eeou ## Logging function set_log_path { diff --git a/libs/messages.sh b/libs/messages.sh index 90eedb0..a080bf3 100755 --- a/libs/messages.sh +++ b/libs/messages.sh @@ -14,7 +14,7 @@ # shellcheck enable=require-variable-braces # Exit upon Errors -set -Ee +set -Eeou ## Message Helpers diff --git a/libs/ustreamer.sh b/libs/ustreamer.sh index aa0140e..50b4001 100755 --- a/libs/ustreamer.sh +++ b/libs/ustreamer.sh @@ -14,7 +14,7 @@ # shellcheck enable=require-variable-braces # Exit upon Errors -set -Ee +set -Eeou run_mjpg() { local cams diff --git a/libs/v4l2_control.sh b/libs/v4l2_control.sh index 0cea2bc..1e11bb1 100755 --- a/libs/v4l2_control.sh +++ b/libs/v4l2_control.sh @@ -16,7 +16,7 @@ # shellcheck enable=require-variable-braces # Exit upon Errors -set -eE +set -Eeou function v4l2_control { v4c_log_msg() { diff --git a/libs/versioncontrol.sh b/libs/versioncontrol.sh index 806bf12..e1eba99 100644 --- a/libs/versioncontrol.sh +++ b/libs/versioncontrol.sh @@ -16,7 +16,7 @@ # shellcheck enable=require-variable-braces # Exit upon Errors -set -Ee +set -Eeou versioncontrol() { diff --git a/libs/watchdog.sh b/libs/watchdog.sh index f535c75..b1a38a3 100755 --- a/libs/watchdog.sh +++ b/libs/watchdog.sh @@ -14,7 +14,7 @@ # shellcheck enable=require-variable-braces # Exit upon Errors -set -Ee +set -Eeou #### Watchdog Functions and Variables ## Do not reuse functions from other libs/scripts!