Skip to content

Commit

Permalink
fix: fix some shellcheck error
Browse files Browse the repository at this point in the history
Signed-off-by: Patrick Gehrsitz <[email protected]>
  • Loading branch information
mryel00 committed Feb 28, 2024
1 parent 93f6cea commit f43e38e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion libs/core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
Expand Down
2 changes: 1 addition & 1 deletion libs/versioncontrol.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f43e38e

Please sign in to comment.