From f43e38e1afbedb01d07f528869a034c06fe8ed4f Mon Sep 17 00:00:00 2001 From: Patrick Gehrsitz Date: Wed, 28 Feb 2024 14:03:03 +0100 Subject: [PATCH] fix: fix some shellcheck error Signed-off-by: Patrick Gehrsitz --- libs/core.sh | 3 ++- libs/versioncontrol.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/core.sh b/libs/core.sh index 088b15f3..d37e2b73 100755 --- a/libs/core.sh +++ b/libs/core.sh @@ -83,13 +83,14 @@ function check_dep { function check_apps { local cstreamer ustreamer ustreamer_base="bin/ustreamer" - ustreamer="$(find ${BASE_CN_PATH}/${ustreamer_base} \ + ustreamer="$(find "${BASE_CN_PATH}"/"${ustreamer_base}" \ -iname 'ustreamer.bin' 2> /dev/null | sed '1q')" cstreamer="bin/camera-streamer/camera-streamer" if [[ -x "${ustreamer}" ]]; then log_msg "Dependency: '${ustreamer##*/}' found in ${ustreamer_base}/${ustreamer##*/}." UST_BIN="${ustreamer}" + # shellcheck disable=SC2034 declare -r UST_BIN else log_msg "Dependency: '${ustreamer##*/}' not found. Exiting!" diff --git a/libs/versioncontrol.sh b/libs/versioncontrol.sh index dc968193..e477c6fd 100644 --- a/libs/versioncontrol.sh +++ b/libs/versioncontrol.sh @@ -28,7 +28,7 @@ versioncontrol() { local cur_ver avail_ver pushd "${BASE_CN_PATH}"/bin/ustreamer &> /dev/null || exit 1 avail_ver="$(git describe --tags --always)" - cur_ver="v$("${UST_BIN}" -v)" + cur_ver="v$(${UST_BIN} -v)" if [[ "${cur_ver}" == "${avail_ver}" ]]; then vc_log_msg "ustreamer is up to date. (${cur_ver})" fi