Skip to content

Commit 9ca15d2

Browse files
committed
fix: move python3-libcamera installation after streamer installation
Signed-off-by: Patrick Gehrsitz <mryel00.github@gmail.com>
1 parent 74ad5a5 commit 9ca15d2

3 files changed

Lines changed: 16 additions & 4 deletions

File tree

tools/install.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,15 @@ main() {
125125
status_msg "Setup streamer apps ..." "1"
126126
fi
127127

128+
if [[ "$(use_pi_specifics)" = "1" ]]; then
129+
msg "Installing Raspberry Pi runtime dependencies ...\n"
130+
if install_pi_dependencies; then
131+
status_msg "Install Pi runtime dependencies ..." "0"
132+
else
133+
status_msg "Install Pi runtime dependencies ..." "1"
134+
fi
135+
fi
136+
128137
if [[ "${CROWSNEST_UNATTENDED}" = "0" ]]; then
129138
set_gpu_mem
130139
fi

tools/libs/core.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ get_host_arch() {
2626

2727
install_dependencies() {
2828
local pkgs="${PKGLIST}"
29-
if [[ "$(use_pi_specifics)" = "1" ]]; then
30-
pkgs+=" ${PKGLIST_PI}"
31-
fi
29+
apt-get --yes --no-install-recommends install ${pkgs} || return 1
30+
}
31+
32+
install_pi_dependencies() {
33+
local pkgs="${PKGLIST_PI}"
3234
apt-get --yes --no-install-recommends install ${pkgs} || return 1
3335
}
3436

tools/libs/manage_apps.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@ ALL_PATHS=(
4343
"${USTREAMER_PATH}"
4444
)
4545

46-
APPS=("mainsail-ustreamer" "mainsail-spyglass")
46+
APPS=("mainsail-ustreamer")
4747
if [[ "$(use_pi_specifics)" = "1" ]]; then
4848
APPS+=("mainsail-camera-streamer-raspi")
4949
else
5050
APPS+=("mainsail-camera-streamer-generic")
5151
fi
52+
APPS+=("mainsail-spyglass")
5253

5354
: "${BASE_USER:=${SUDO_USER:-${USER}}}"
5455
CROWSNEST_VENV_PATH="/home/${BASE_USER}/crowsnest-env"

0 commit comments

Comments
 (0)