CreatBot/CreatBotMoonraker
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install: fix dbus provider detection

Browse Source 
Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2023-10-08 12:10:54 -04:00
parent fd11c08b99
commit b8ce199edd
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/install-moonraker.sh
View File

@ -14,7 +14,6 @@ DATA_PATH="${MOONRAKER_DATA_PATH}"
INSTANCE_ALIAS="${MOONRAKER_ALIAS:-moonraker}" INSTANCE_ALIAS="${MOONRAKER_ALIAS:-moonraker}"
SPEEDUPS="${MOONRAKER_SPEEDUPS:-n}" SPEEDUPS="${MOONRAKER_SPEEDUPS:-n}"
SERVICE_VERSION="1" SERVICE_VERSION="1"
MACHINE_PROVIDER="systemd_cli"
package_decode_script=$( cat << EOF package_decode_script=$( cat << EOF
import sys import sys
@ -111,6 +110,12 @@ init_data_path()
[ -n "${CONFIG_PATH}" ] && config_file=${CONFIG_PATH} [ -n "${CONFIG_PATH}" ] && config_file=${CONFIG_PATH}
# Write initial configuration for first time installs # Write initial configuration for first time installs
if [ ! -f $SERVICE_FILE ] && [ ! -e "${config_file}" ]; then if [ ! -f $SERVICE_FILE ] && [ ! -e "${config_file}" ]; then
# detect machine provider
if [ "$( systemctl is-active dbus )" = "active" ]; then
provider="systemd_dbus"
else
provider="systemd_cli"
fi
report_status "Writing Config File ${config_file}:\n" report_status "Writing Config File ${config_file}:\n"
/bin/sh -c "cat > ${config_file}" << EOF /bin/sh -c "cat > ${config_file}" << EOF
# Moonraker Configuration File # Moonraker Configuration File
@ -123,7 +128,7 @@ port: 7125
klippy_uds_address: /tmp/klippy_uds klippy_uds_address: /tmp/klippy_uds
[machine] [machine]
provider: ${MACHINE_PROVIDER} provider: ${provider}
EOF EOF
cat ${config_file} cat ${config_file}
@ -177,7 +182,7 @@ EOF
# Step 7: Validate/Install polkit rules # Step 7: Validate/Install polkit rules
check_polkit_rules() check_polkit_rules()
{ {
if [ ! -x "$(command -v pkaction)" ]; then if [ ! -x "$(command -v pkaction || true)" ]; then
return return
fi fi
POLKIT_VERSION="$( pkaction --version | grep -Po "(\d+\.?\d*)" )" POLKIT_VERSION="$( pkaction --version | grep -Po "(\d+\.?\d*)" )"
@ -204,10 +209,7 @@ check_polkit_rules()
else else
report_status "Installing PolKit Rules" report_status "Installing PolKit Rules"
${SRCDIR}/scripts/set-policykit-rules.sh -z ${SRCDIR}/scripts/set-policykit-rules.sh -z
MACHINE_PROVIDER="systemd_dbus"
fi fi
else
MACHINE_PROVIDER="systemd_dbus"
fi fi
} }