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

fix: add bookworm support (#195)

Browse Source
This commit is contained in:
Patrick Gehrsitz 2023-11-01 22:43:17 +01:00 committed by GitHub
parent b85de7b0ab
commit 5c040f24c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/build.sh
View File

@ -39,7 +39,7 @@ fi
# Camera-streamer repo # Camera-streamer repo
CSTREAMER_PATH="camera-streamer" CSTREAMER_PATH="camera-streamer"
if [[ -z "${CROWSNEST_CAMERA_STREAMER_REPO_SHIP}" ]]; then if [[ -z "${CROWSNEST_CAMERA_STREAMER_REPO_SHIP}" ]]; then
CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/ayufan-research/camera-streamer.git" CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/ayufan/camera-streamer.git"
fi fi
if [[ -z "${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH}" ]]; then if [[ -z "${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH}" ]]; then
CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="master" CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="master"

2
tools/configure.sh
View File

@ -28,7 +28,7 @@ CN_CONFIG_ENVPATH="${CN_CONFIG_ROOTPATH}/systemd"
CN_MOONRAKER_CONFIG_PATH="${CN_CONFIG_CONFIGPATH}/moonraker.conf" CN_MOONRAKER_CONFIG_PATH="${CN_CONFIG_CONFIGPATH}/moonraker.conf"
CN_USTREAMER_REPO="https://github.com/pikvm/ustreamer.git" CN_USTREAMER_REPO="https://github.com/pikvm/ustreamer.git"
CN_USTREAMER_BRANCH="master" CN_USTREAMER_BRANCH="master"
CN_CAMERA_STREAMER_REPO="https://github.com/ayufan-research/camera-streamer.git" CN_CAMERA_STREAMER_REPO="https://github.com/ayufan/camera-streamer.git"
CN_CAMERA_STREAMER_BRANCH="master" CN_CAMERA_STREAMER_BRANCH="master"
### Messages ### Messages

6
tools/install.sh
View File

@ -128,6 +128,12 @@ main() {
add_group_video add_group_video
if [[ "$(is_bookworm)" = "1" ]]; then
msg "Bookworm detected!"
msg "Using main branch of camera-streamer for Bookworm..."
CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="main"
fi
build_apps build_apps
if [[ "${CROWSNEST_UNATTENDED}" = "0" ]]; then if [[ "${CROWSNEST_UNATTENDED}" = "0" ]]; then

6
tools/libs/core.sh
View File

@ -34,6 +34,12 @@ is_buster() {
fi fi
} }
is_bookworm() {
if [[ -f /etc/os-release ]]; then
grep -cq "bookworm" /etc/os-release &> /dev/null && echo "1" || echo "0"
fi
}
is_raspbian() { is_raspbian() {
if [[ -f /boot/config.txt ]] && [[ -f /etc/rpi-issue ]]; then if [[ -f /boot/config.txt ]] && [[ -f /etc/rpi-issue ]]; then
echo "1" echo "1"