Skip to content

Commit

Permalink
fix: fix empty string if ustreamer not found (mainsail-crew#253)
Browse files Browse the repository at this point in the history
Signed-off-by: Patrick Gehrsitz <[email protected]>
  • Loading branch information
mryel00 authored Apr 2, 2024
1 parent a9db8f9 commit 7f85366
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions libs/core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,15 @@ function check_dep {

function check_apps {
local cstreamer ustreamer
ustreamer_base="bin/ustreamer"
ustreamer="$(find "${BASE_CN_PATH}"/"${ustreamer_base}" \
-iname 'ustreamer.bin' 2> /dev/null | sed '1q')"
ustreamer="bin/ustreamer/src/ustreamer.bin"
cstreamer="bin/camera-streamer/camera-streamer"

if [[ -x "${ustreamer}" ]]; then
log_msg "Dependency: '${ustreamer##*/}' found in ${ustreamer_base}/${ustreamer##*/}."
UST_BIN="${ustreamer}"
if [[ -x "${BASE_CN_PATH}/${ustreamer}" ]]; then
log_msg "Dependency: 'ustreamer' found in ${ustreamer}."
UST_BIN="${BASE_CN_PATH}/${ustreamer}"
# shellcheck disable=SC2034
declare -r UST_BIN
else
log_msg "Dependency: '${ustreamer##*/}' not found. Exiting!"
log_msg "Dependency: 'ustreamer' not found. Exiting!"
exit 1
fi

Expand Down

0 comments on commit 7f85366

Please sign in to comment.