[Automated] Merged develop into target master

mainsail-crew · Feb 28, 2024 · a5e4988 · a5e4988
2 parents ba0ac8f + d0c2ca5
commit a5e4988
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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