From 485c723a3c9512f6402105f8888153933c8cc8ab Mon Sep 17 00:00:00 2001 From: Eric Callahan Date: Thu, 6 Oct 2022 10:30:41 -0400 Subject: [PATCH] install: only write initial config for first time installs This prevents an upgrade from unintentionally populating the config directory when a legacy install exists. Signed-off-by: Eric Callahan --- scripts/install-moonraker.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/install-moonraker.sh b/scripts/install-moonraker.sh index 13acbf0..3b02917 100755 --- a/scripts/install-moonraker.sh +++ b/scripts/install-moonraker.sh @@ -80,7 +80,8 @@ init_data_path() [ ! -e "${logs_dir}" ] && mkdir ${logs_dir} [ ! -e "${env_dir}" ] && mkdir ${env_dir} [ -n "${CONFIG_PATH}" ] && config_file=${CONFIG_PATH} - if [ ! -e "${config_file}" ]; then + # Write initial configuration for first time installs + if [ ! -f $SERVICE_FILE ] && [ ! -e "${config_file}" ]; then report_status "Writing Config File ${config_file}:\n" /bin/sh -c "cat > ${config_file}" << EOF # Moonraker Configuration File @@ -105,7 +106,6 @@ install_script() { # Create systemd service file ENV_FILE="${DATA_PATH}/systemd/moonraker.env" - SERVICE_FILE="${SYSTEMDDIR}/${INSTANCE_ALIAS}.service" if [ ! -f $ENV_FILE ] || [ $FORCE_DEFAULTS = "y" ]; then rm -f $ENV_FILE args="MOONRAKER_ARGS=\"${SRCDIR}/moonraker/moonraker.py" @@ -236,6 +236,9 @@ if [ -z "${DATA_PATH}" ]; then fi fi fi + +SERVICE_FILE="${SYSTEMDDIR}/${INSTANCE_ALIAS}.service" + # Run installation steps defined above verify_ready cleanup_legacy