fix(sonar): fixes missing moonraker update manager entry (#112)

This should fix missing moonraker update_manager entry

Signed-off-by: Stephan Wendel <me@stephanwe.de>

Author: KwadFan

src/modules/sonar/config

@@ -10,9 +10,12 @@
 # shellcheck disable=all
 
 # Sonar
-[ -n "$SONAR_SONAR_REPO_SHIP" ] || SONAR_SONAR_REPO_SHIP=https://github.com/mainsail-crew/sonar.git
-[ -n "$SONAR_SONAR_REPO_BRANCH" ] || SONAR_SONAR_REPO_BRANCH=main
-[ -n "$SONAR_SONAR_DEPS" ] || SONAR_SONAR_DEPS="git crudini iputils-ping"
-[ -n "$SONAR_SONAR_DEFAULT_CONF" ] || SONAR_SONAR_DEFAULT_CONF="mainsail_default.conf"
-# Add Sonar to moonraker.conf (update manager) bool (1:yes / 0:no)
-[ -n "$SONAR_SONAR_ADD_SONAR_MOONRAKER" ] || SONAR_SONAR_ADD_SONAR_MOONRAKER=1
+[ -n "$SONAR_REPO_SHIP" ] || SONAR_REPO_SHIP=https://github.com/mainsail-crew/sonar.git
+[ -n "$SONAR_REPO_BRANCH" ] || SONAR_REPO_BRANCH=main
+[ -n "$SONAR_DEPS" ] || SONAR_DEPS="git crudini iputils-ping"
+[ -n "$SONAR_DEFAULT_CONF_DIR" ] || SONAR_DEFAULT_CONF_DIR="/home/${BASE_USER}/klipper_config"
+[ -n "$SONAR_DEFAULT_CONF" ] || SONAR_DEFAULT_CONF="mainsail_default.conf"
+# Add Sonar to moonraker.conf (update_manager) bool (1:yes / 0:no)
+[ -n "$SONAR_ADD_SONAR_MOONRAKER" ] || SONAR_ADD_SONAR_MOONRAKER=1
+# Path to moonraker.conf (must be set if add to update_manager)
+[ -n "$SONAR_MOONRAKER_CONF" ] || SONAR_MOONRAKER_CONF="${SONAR_DEFAULT_CONF_DIR}/moonraker.conf"

src/modules/sonar/start_chroot_script

@@ -8,44 +8,77 @@
 #### This File is distributed under GPLv3
 ####
 
-# # shellcheck enable=require-variable-braces
+# shellcheck enable=require-variable-braces
 
-# Error handling
-set -ex
+## Source error handling, leave this in place
+set -Eex
 
+## Set LC_ALL to prevent errors
+export LC_ALL=C
+
+# Set DEBIAN_FRONTEND to noninteractive
+if [ "${DEBIAN_FRONTEND}" != "noninteractive" ]; then
+    export DEBIAN_FRONTEND=noninteractive
+fi
+
+## Source CustomPIOS common.sh
+# shellcheck disable=SC1091
 source /common.sh
 install_cleanup_trap
 
+# Setup template file
+MOONRAKER_TEMPLATE="/home/${BASE_USER}/sonar/file_templates/moonraker_update.txt"
+
+## helper func moonraker update_manager
+function add_update_entry {
+    if [ -f "${SONAR_MOONRAKER_CONF}" ]; then
+        if [ -f "/tmp/moonraker.conf" ]; then
+            rm -rf /tmp/moonraker.conf
+        fi
+        sudo -u "${BASE_USER}" \
+        cat "${SONAR_MOONRAKER_CONF}" "${MOONRAKER_TEMPLATE}" | \
+        tee /tmp/moonraker.conf > /dev/null &&
+        cp -rf /tmp/moonraker.conf "${SONAR_MOONRAKER_CONF}"
+    fi
+}
+
 echo_green "Installing sonar and enable sonar Service ..."
-# install dependencies
-# force apt update
+
+## Install all deps at once for time consumption reasons.
+## APT: Update Repo Database and install Dependencies
+# Force apt update
 apt update
-check_install_pkgs "${SONAR_SONAR_DEPS}"
-# Move to $HOME dir
-pushd /home/"${BASE_USER}" &> /dev/null || exit 1
-    # clone Repo
+echo_green "Installing Sonar Dependencies ..."
+# shellcheck disable=SC2086
+## Disabling shellcheck SC2086, because we want "wordsplitting"
+check_install_pkgs ${SONAR_DEPS}
+## Move to $HOME dir
+pushd "/home/${BASE_USER}" &> /dev/null || exit 1
+    ## clone Repo
     echo_green "Clone sonar repository ..."
-    gitclone SONAR_SONAR_REPO sonar
-    # install sonar
-    pushd /home/"${BASE_USER}"/sonar &> /dev/null || exit 1
+    gitclone SONAR_REPO sonar
+    ## Install sonar, using builtin installer
+    pushd "/home/${BASE_USER}/sonar" &> /dev/null || exit 1
     echo_green "Running sonar installer ..."
-    if [ "${SONAR_SONAR_ADD_MOONRAKER}" == "1" ]; then
-        sudo -u "${BASE_USER}" \
-        make unattended
-    else
-        sudo -u "${BASE_USER}" \
-        make install
-    fi
-    if [ ! -d "/home/${BASE_USER}/klipper_config" ]; then
-        mkdir -p "/home/${BASE_USER}/klipper_config"
+        sudo -u "${BASE_USER}" make unattended
+    ## Make sure config dir exits
+    if [ ! -d "${SONAR_DEFAULT_CONF_DIR}" ]; then
+        sudo -u "${BASE_USER}" mkdir -p "${SONAR_DEFAULT_CONF_DIR}"
     fi
+    ## Copy default config
     echo_green "Copying default config file ..."
     sudo -u "${BASE_USER}" \
-    cp "${PWD}/sample_config/${SONAR_SONAR_DEFAULT_CONF}" \
-    "/home/${BASE_USER}/klipper_config/sonar.conf"
-    popd &> /dev/null || exit 1
-
-# enable systemd service
-systemctl_if_exists enable sonar.service
+    cp "${PWD}/sample_config/${SONAR_DEFAULT_CONF}" \
+    "${SONAR_DEFAULT_CONF_DIR}/sonar.conf"
 
+    ## Add moonraker update_manager
+    if [ "${SONAR_ADD_SONAR_MOONRAKER}" == "1" ]; then
+        echo -en "Adding Sonar Update Manager entry to moonraker.conf ...\r"
+        add_update_entry
+        echo -e "Adding Sonar Update Manager entry to moonraker.conf ... [OK]"
+    fi
+    popd &> /dev/null || exit 1
 popd &> /dev/null || exit 1
+
+## Done message
+echo_green "Installing sonar and enable sonar Service ... done!"