fix: add bookworm support

mryel00 · Oct 30, 2023 · 1ae76b0 · 1ae76b0
1 parent ae2bc21
commit 1ae76b0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/bin/build.sh b/bin/build.sh
@@ -39,7 +39,7 @@ fi
 # Camera-streamer repo
 CSTREAMER_PATH="camera-streamer"
 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
 if [[ -z "${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH}" ]]; then
     CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="master"

diff --git a/tools/configure.sh b/tools/configure.sh
@@ -28,7 +28,7 @@ CN_CONFIG_ENVPATH="${CN_CONFIG_ROOTPATH}/systemd"
 CN_MOONRAKER_CONFIG_PATH="${CN_CONFIG_CONFIGPATH}/moonraker.conf"
 CN_USTREAMER_REPO="https://github.com/pikvm/ustreamer.git"
 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"
 
 ### Messages

diff --git a/tools/install.sh b/tools/install.sh
@@ -128,6 +128,12 @@ main() {
 
     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="${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH_BOOKWORM}"
+    fi
+
     build_apps
 
     if [[ "${CROWSNEST_UNATTENDED}" = "0" ]]; then

diff --git a/tools/libs/config.sh b/tools/libs/config.sh
@@ -39,6 +39,7 @@ import_config() {
         [[ -n "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]] || CROWSNEST_USTREAMER_REPO_BRANCH="master"
         [[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_SHIP}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/ayufan/camera-streamer.git"
         [[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="master"
+        [[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH_BOOKWORM}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_BRANCH_BOOKWORM="main"
         status_msg "Using default configuration ..." "0"
     fi
 }
diff --git a/tools/libs/core.sh b/tools/libs/core.sh
@@ -34,6 +34,12 @@ is_buster() {
     fi
 }
 
+is_bookworm() {
+    if [[ -f /etc/os-release ]]; then
+        grep -cq "bookworm" /etc/os-release &> /dev/null && echo "1" || echo "0"
+    fi
+}
+
 is_raspbian() {
     if [[ -f /boot/config.txt ]] && [[ -f /etc/rpi-issue ]]; then
         echo "1"