From 16327ff551ad56ae9e6de799a2f18a195b830917 Mon Sep 17 00:00:00 2001 From: Frank Tackitt Date: Tue, 19 Jul 2022 11:51:06 -0700 Subject: [PATCH] install-moonraker: allow configurable virtualenv location Signed-off-by: Franklyn Tackitt --- docs/installation.md | 10 ++++++++++ scripts/install-moonraker.sh | 12 ++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/docs/installation.md b/docs/installation.md index fee9be5..396b574 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -136,6 +136,16 @@ particularly for those upgrading: This is useful for installations that occur outside of a standard environment where systemd is not running. +Additionally, installation may be customized with the following environment +variables: + +- `MOONRAKER_VENV` +- `MOONRAKER_REBUILD_ENV` +- `MOONRAKER_FORCE_DEFAULTS` +- `MOONRAKER_DISABLE_SYSTEMCTL` +- `MOONRAKER_CONFIG_PATH` +- `MOONRAKER_LOG_PATH` + When the script completes it should start both Moonraker and Klipper. In `/tmp/klippy.log` you should find the following entry: diff --git a/scripts/install-moonraker.sh b/scripts/install-moonraker.sh index 4b1c827..de11ab2 100755 --- a/scripts/install-moonraker.sh +++ b/scripts/install-moonraker.sh @@ -2,13 +2,13 @@ # This script installs Moonraker on a Raspberry Pi machine running # Raspbian/Raspberry Pi OS based distributions. -PYTHONDIR="${HOME}/moonraker-env" +PYTHONDIR="${MOONRAKER_VENV:-${HOME}/moonraker-env}" SYSTEMDDIR="/etc/systemd/system" -REBUILD_ENV="n" -FORCE_DEFAULTS="n" -DISABLE_SYSTEMCTL="n" -CONFIG_PATH="${HOME}/moonraker.conf" -LOG_PATH="/tmp/moonraker.log" +REBUILD_ENV="${MOONRAKER_REBUILD_ENV:-n}" +FORCE_DEFAULTS="${MOONRAKER_FORCE_DEFAULTS:-n}" +DISABLE_SYSTEMCTL="${MOONRAKER_DISABLE_SYSTEMCTL:-n}" +CONFIG_PATH="${MOONRAKER_CONFIG_PATH:-${HOME}/moonraker.conf}" +LOG_PATH="${MOONRAKER_LOG_PATH:-/tmp/moonraker.log}" # Step 2: Clean up legacy installation cleanup_legacy() {