CreatBot/CreatBotCrowsnest
CreatBot/CreatBotCrowsnest
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Automated] Merged develop into target master

Browse Source
This commit is contained in:
Stefan Dej 2024-02-28 16:29:45 +01:00 committed by GitHub
commit a5e498822d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/core.sh
View File

@ -82,11 +82,16 @@ function check_dep {
function check_apps { function check_apps {
local cstreamer ustreamer 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" cstreamer="bin/camera-streamer/camera-streamer"
if [[ -x "${BASE_CN_PATH}/${ustreamer}" ]]; then if [[ -x "${ustreamer}" ]]; then
log_msg "Dependency: '${ustreamer##*/}' found in ${ustreamer}." log_msg "Dependency: '${ustreamer##*/}' found in ${ustreamer_base}/${ustreamer##*/}."
UST_BIN="${ustreamer}"
# shellcheck disable=SC2034
declare -r UST_BIN
else else
log_msg "Dependency: '${ustreamer##*/}' not found. Exiting!" log_msg "Dependency: '${ustreamer##*/}' not found. Exiting!"
exit 1 exit 1

3
libs/ustreamer.sh
View File

@ -31,7 +31,8 @@ run_mjpg() {
run_ustreamer() { run_ustreamer() {
local cam_sec ust_bin dev pt res fps cstm start_param local cam_sec ust_bin dev pt res fps cstm start_param
cam_sec="${1}" 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)" dev="$(get_param "cam ${cam_sec}" device)"
pt="$(get_param "cam ${cam_sec}" port)" pt="$(get_param "cam ${cam_sec}" port)"
res="$(get_param "cam ${cam_sec}" resolution)" res="$(get_param "cam ${cam_sec}" resolution)"

2
libs/versioncontrol.sh
View File

@ -28,7 +28,7 @@ versioncontrol() {
local cur_ver avail_ver local cur_ver avail_ver
pushd "${BASE_CN_PATH}"/bin/ustreamer &> /dev/null || exit 1 pushd "${BASE_CN_PATH}"/bin/ustreamer &> /dev/null || exit 1
avail_ver="$(git describe --tags --always)" avail_ver="$(git describe --tags --always)"
cur_ver="v$("${PWD}"/ustreamer -v)" cur_ver="v$(${UST_BIN} -v)"
if [[ "${cur_ver}" == "${avail_ver}" ]]; then if [[ "${cur_ver}" == "${avail_ver}" ]]; then
vc_log_msg "ustreamer is up to date. (${cur_ver})" vc_log_msg "ustreamer is up to date. (${cur_ver})"
fi fi