From d0c2ca5d1613d81cdb17cded1438d4bc5d6b0995 Mon Sep 17 00:00:00 2001 From: Patrick Gehrsitz Date: Wed, 28 Feb 2024 16:15:07 +0100 Subject: [PATCH] fix: fix ustreamer binary path for v5.52 changes (#245) Signed-off-by: Patrick Gehrsitz --- libs/core.sh | 11 ++++++++--- libs/ustreamer.sh | 3 ++- libs/versioncontrol.sh | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libs/core.sh b/libs/core.sh index aab784df..d37e2b73 100755 --- a/libs/core.sh +++ b/libs/core.sh @@ -82,11 +82,16 @@ function check_dep { function check_apps { local cstreamer ustreamer - ustreamer="bin/ustreamer/ustreamer" + ustreamer_base="bin/ustreamer" + ustreamer="$(find "${BASE_CN_PATH}"/"${ustreamer_base}" \ + -iname 'ustreamer.bin' 2> /dev/null | sed '1q')" cstreamer="bin/camera-streamer/camera-streamer" - if [[ -x "${BASE_CN_PATH}/${ustreamer}" ]]; then - log_msg "Dependency: '${ustreamer##*/}' found in ${ustreamer}." + 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!" exit 1 diff --git a/libs/ustreamer.sh b/libs/ustreamer.sh index e4c7c451..88fc1a33 100755 --- a/libs/ustreamer.sh +++ b/libs/ustreamer.sh @@ -31,7 +31,8 @@ run_mjpg() { run_ustreamer() { local cam_sec ust_bin dev pt res fps cstm start_param cam_sec="${1}" - ust_bin="${BASE_CN_PATH}/bin/ustreamer/ustreamer" + # shellcheck disable=SC2153 + ust_bin="${UST_BIN}" dev="$(get_param "cam ${cam_sec}" device)" pt="$(get_param "cam ${cam_sec}" port)" res="$(get_param "cam ${cam_sec}" resolution)" diff --git a/libs/versioncontrol.sh b/libs/versioncontrol.sh index 2c7b1850..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$("${PWD}"/ustreamer -v)" + cur_ver="v$(${UST_BIN} -v)" if [[ "${cur_ver}" == "${avail_ver}" ]]; then vc_log_msg "ustreamer is up to date. (${cur_ver})" fi