Skip to content

Commit 4ea1a35

Browse files
committed
chore: update moonraker module
Update of moonraker module according to Arksine/moonraker#516 Signed-off-by: Stephan Wendel <me@stephanwe.de>
1 parent fc95133 commit 4ea1a35

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

src/modules/moonraker/config

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
#!/usr/bin/env bash
2+
#Shebang for better file detection
13
[ -n "$MOONRAKER_REPO_SHIP" ] || MOONRAKER_REPO_SHIP=https://github.com/Arksine/moonraker.git
24
[ -n "$MOONRAKER_REPO_BRANCH" ] || MOONRAKER_REPO_BRANCH=master

src/modules/moonraker/start_chroot_script

+11-10
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,34 @@
77
# GPL V3
88
########
99

10+
# shellcheck enable=require-variable-braces
11+
1012
# Source error handling, leave this in place
1113
set -xe
1214

1315
# Source CustomPIOS common.sh
16+
# shellcheck disable=SC1091
1417
source /common.sh
1518
install_cleanup_trap
1619

1720
# make sure that this module can be used standalone
1821
apt_update_skip
19-
check_install_pkgs "git virtualenv wireless-tools"
22+
check_install_pkgs "git"
2023

2124
echo_green "Installing Moonraker and enable Moonraker Service"
22-
# install MainsailOS premade moonraker.conf
23-
echo_green "Copying MainsailOS premade moonraker.conf"
24-
unpack /filesystem/home/${BASE_USER} /home/${BASE_USER} ${BASE_USER}
2525
# clone klipper repo
26-
pushd /home/${BASE_USER}
26+
pushd /home/"${BASE_USER}"
2727
gitclone MOONRAKER_REPO moonraker
2828
# use moonrakers Install script
2929
echo_green "Launch moonraker Install script (scripts/install-moonraker.sh)"
30-
sudo -u ${BASE_USER} \
30+
sudo -u "${BASE_USER}" \
3131
bash -c \
32-
'${HOME}/moonraker/scripts/install-moonraker.sh \
33-
-c ${HOME}/klipper_config/moonraker.conf \
34-
-l ${HOME}/klipper_logs/moonraker.log'
32+
'${HOME}/moonraker/scripts/install-moonraker.sh -z -x'
3533
# install Polkit Rules
3634
echo_green "Install PolicyKit Rules"
37-
sudo -u ${BASE_USER} sh -c './moonraker/scripts/set-policykit-rules.sh --root'
35+
sudo -u "${BASE_USER}" sh -c './moonraker/scripts/set-policykit-rules.sh --root'
3836
# finished
3937
popd
38+
# install MainsailOS premade moonraker.conf
39+
echo_green "Copying MainsailOS premade moonraker.conf"
40+
unpack /filesystem/home/"${BASE_USER}" /home/"${BASE_USER}" "${BASE_USER}"

0 commit comments

Comments
 (0)