From afcb651abd501a715345100e79f5a4a2c61515eb Mon Sep 17 00:00:00 2001
From: Stephan Wendel <me@stephanwe.de>
Date: Mon, 7 Mar 2022 18:22:22 +0100
Subject: [PATCH] fix: fixed custompios module

Module now uses "make install"

Added new Option in config:
CROWSNEST_FORCE_RASPICAMFIX="[y|n]"

The Installer ignores to implement Raspicamfix due qemu environment.
Choose "y" to force install of fix.
Works only with Raspberry SBC's!

Signed-off-by: Stephan Wendel <me@stephanwe.de>
---
 custompios/crowsnest/config              |  1 +
 custompios/crowsnest/start_chroot_script | 52 ++++++++++++++----------
 file_templates/moonraker_update.txt      |  1 -
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/custompios/crowsnest/config b/custompios/crowsnest/config
index eb8297e..afdaa5e 100644
--- a/custompios/crowsnest/config
+++ b/custompios/crowsnest/config
@@ -16,6 +16,7 @@
 [ -n "$CROWSNEST_DEFAULT_CONF" ] || CROWSNEST_DEFAULT_CONF="mainsail_default.conf"
 [ -n "$CROWSNEST_DEFAULT_CONF_DIR" ] || CROWSNEST_DEFAULT_CONF_DIR="/home/${BASE_USER}/klipper_config"
 [ -n "$CROWSNEST_MOONRAKER_SUPPORT" ] || CROWSNEST_MOONRAKER_SUPPORT="y"
+[ -n "$CROWSNEST_FORCE_RASPICAMFIX" ] || CROWSNEST_FORCE_RASPICAMFIX="y"
 
 # ustreamer
 [ -n "$CROWSNEST_USTREAMER_DEPS" ] || CROWSNEST_USTREAMER_DEPS="git build-essential libevent-dev libjpeg62-turbo-dev \
diff --git a/custompios/crowsnest/start_chroot_script b/custompios/crowsnest/start_chroot_script
index cabf682..7dac250 100644
--- a/custompios/crowsnest/start_chroot_script
+++ b/custompios/crowsnest/start_chroot_script
@@ -20,26 +20,36 @@ install_cleanup_trap
 
 echo_green "Installing crowsnest and enable webcam Service ..."
 # install dependencies
-apt_update_skip
+# force apt update
+apt update
 check_install_pkgs ${CROWSNEST_CROWSNEST_DEPS}
 # Move to $HOME dir
-pushd /home/${BASE_USER}
-# make sure config folder exist
-if [ ! -d "${CROWSNEST_DEFAULT_CONF_DIR}" ]; then
-    mkdir -p "${CROWSNEST_DEFAULT_CONF_DIR}"
-fi
-# clone Repo
-echo_green "Clone crowsnest repository ..."
-gitclone CROWSNEST_CROWSNEST_REPO crowsnest
-# install crowsnest
-pushd /home/${BASE_USER}/crowsnest
-echo_green "Running crowsnest installer ..."
-sudo -u ${BASE_USER} make install
-# add update manager section to moonraker.conf
-if [ -f "/home/${BASE_USER}/klipper_config/moonraker.conf" ] &&
-[ "${CROWSNEST_MOONRAKER_SUPPORT}" == "y" ]; then
-    cat file_templates/moonraker_update.txt | \
-    sudo -u ${BASE_USER} tee -a /home/${BASE_USER}/klipper_config/moonraker.conf
-fi
-popd
-popd
+pushd /home/${BASE_USER} &> /dev/null || exit 1
+    # make sure config folder exist
+    if [ ! -d "${CROWSNEST_DEFAULT_CONF_DIR}" ]; then
+        sudo -u "${BASE_USER}" mkdir -p "${CROWSNEST_DEFAULT_CONF_DIR}"
+    fi
+    # clone Repo
+    echo_green "Clone crowsnest repository ..."
+    gitclone CROWSNEST_CROWSNEST_REPO crowsnest
+    # install crowsnest
+    pushd /home/${BASE_USER}/crowsnest &> /dev/null || exit 1
+    echo_green "Running crowsnest installer ..."
+    sudo -u "${BASE_USER}" make install
+    # add update manager section to moonraker.conf
+    if [ -f "/home/${BASE_USER}/klipper_config/moonraker.conf" ] &&
+    [ "${CROWSNEST_MOONRAKER_SUPPORT}" == "y" ]; then
+        sudo -u ${BASE_USER} \
+        sh -c 'echo -e "\n" >> /home/$(whoami)/klipper_config/moonraker.conf'
+        sudo -u ${BASE_USER} \
+        sh -c 'cat file_templates/moonraker_update.txt \
+        >> /home/$(whoami)/klipper_config/moonraker.conf'
+    fi
+    if [ "${CROWSNEST_FORCE_RASPICAMFIX}" == "y" ]; then
+        echo -en "Applying Raspicam Fix ... \r"
+        sudo sh -c 'echo "bcm2835-v4l2" >> /etc/modules'
+        sudo cp file_templates/bcm2835-v4l2.conf /etc/modprobe.d/
+        echo -e "Applying Raspicam Fix ... [OK]"
+    fi
+    popd &> /dev/null || exit 1
+popd &> /dev/null || exit 1
diff --git a/file_templates/moonraker_update.txt b/file_templates/moonraker_update.txt
index 4558bb7..b83223a 100644
--- a/file_templates/moonraker_update.txt
+++ b/file_templates/moonraker_update.txt
@@ -1,4 +1,3 @@
-
 [update_manager webcamd]
 type: git_repo
 path: ~/crowsnest