Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix empty string if ustreamer not found #253

Merged
merged 3 commits into from
Apr 2, 2024
Merged

fix: fix empty string if ustreamer not found #253

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63ccfbe
fix: fix empty string if ustreamer not found
mryel00 Mar 7, 2024
48047b0
refactor: use dirname
mryel00 Apr 2, 2024
8f987f6
fix: hardcode path and message to fix log
mryel00 Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions libs/core.sh
View file
Open in desktop
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
Loading