chore: update moonraker module

Update of moonraker module according to Arksine/moonraker#516 Signed-off-by: Stephan Wendel <[email protected]>
mainsail-crew · Oct 22, 2022 · 4ea1a35 · 4ea1a35
1 parent fc95133
commit 4ea1a35
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/modules/moonraker/config b/src/modules/moonraker/config
@@ -1,2 +1,4 @@
+#!/usr/bin/env bash
+#Shebang for better file detection
 [ -n "$MOONRAKER_REPO_SHIP" ] || MOONRAKER_REPO_SHIP=https://github.com/Arksine/moonraker.git
 [ -n "$MOONRAKER_REPO_BRANCH" ] || MOONRAKER_REPO_BRANCH=master
diff --git a/...tem/home/pi/klipper_config/moonraker.conf → ...ome/pi/printer_data/config/moonraker.conf b/...tem/home/pi/klipper_config/moonraker.conf → ...ome/pi/printer_data/config/moonraker.conf
diff --git a/src/modules/moonraker/start_chroot_script b/src/modules/moonraker/start_chroot_script
@@ -7,33 +7,34 @@
 # GPL V3
 ########
 
+# shellcheck enable=require-variable-braces
+
 # Source error handling, leave this in place
 set -xe
 
 # Source CustomPIOS common.sh
+# shellcheck disable=SC1091
 source /common.sh
 install_cleanup_trap
 
 # make sure that this module can be used standalone
 apt_update_skip
-check_install_pkgs "git virtualenv wireless-tools"
+check_install_pkgs "git"
 
 echo_green "Installing Moonraker and enable Moonraker Service"
-# install MainsailOS premade moonraker.conf
-echo_green "Copying MainsailOS premade moonraker.conf"
-unpack /filesystem/home/${BASE_USER} /home/${BASE_USER} ${BASE_USER}
 # clone klipper repo
-pushd /home/${BASE_USER}
+pushd /home/"${BASE_USER}"
 gitclone MOONRAKER_REPO moonraker
 # use moonrakers Install script
 echo_green "Launch moonraker Install script (scripts/install-moonraker.sh)"
-sudo -u ${BASE_USER} \
+sudo -u "${BASE_USER}" \
 bash -c \
-'${HOME}/moonraker/scripts/install-moonraker.sh \
--c ${HOME}/klipper_config/moonraker.conf \
--l ${HOME}/klipper_logs/moonraker.log'
+'${HOME}/moonraker/scripts/install-moonraker.sh -z -x'
 # install Polkit Rules
 echo_green "Install PolicyKit Rules"
-sudo -u ${BASE_USER} sh -c './moonraker/scripts/set-policykit-rules.sh --root'
+sudo -u "${BASE_USER}" sh -c './moonraker/scripts/set-policykit-rules.sh --root'
 # finished
 popd
+# install MainsailOS premade moonraker.conf
+echo_green "Copying MainsailOS premade moonraker.conf"
+unpack /filesystem/home/"${BASE_USER}" /home/"${BASE_USER}" "${BASE_USER}"