diff --git a/scripts/fluidd.sh b/scripts/fluidd.sh index 2778d67..c3170c4 100644 --- a/scripts/fluidd.sh +++ b/scripts/fluidd.sh @@ -16,12 +16,12 @@ set -e #===================================================# function install_fluidd() { - ### exit early if moonraker not found if [[ -z $(moonraker_systemd) ]]; then - local error="Moonraker not installed! Please install Moonraker first!" + local error="Moonraker not installed! It's recommended to install Moonraker first!" print_error "${error}" while true; do - read -p "${cyan}###### Install Fluidd without Moonraker? (y/N):${white} " yn + local yn + read -p "${cyan}###### Proceed to install Fluidd without installing Moonraker? (y/N):${white} " yn case "${yn}" in Y|y|Yes|yes) select_msg "Yes" @@ -44,7 +44,7 @@ function install_fluidd() { status_msg "Initializing Fluidd installation ..." ### first, we create a backup of the full klipper_config dir - safety first! - backup_klipper_config_dir + #backup_klipper_config_dir ### check for other enabled web interfaces unset SET_LISTEN_PORT diff --git a/scripts/mainsail.sh b/scripts/mainsail.sh index b5245a9..295fd49 100644 --- a/scripts/mainsail.sh +++ b/scripts/mainsail.sh @@ -16,12 +16,12 @@ set -e #===================================================# function install_mainsail() { - ### exit early if moonraker not found if [[ -z $(moonraker_systemd) ]]; then - local error="Moonraker not installed! Please install Moonraker first!" + local error="Moonraker not installed! It's recommended to install Moonraker first!" print_error "${error}" while true; do - read -p "${cyan}###### Install remote-mode Mainsail without Moonraker? (y/N):${white} " yn + local yn + read -p "${cyan}###### Proceed to install Mainsail without installing Moonraker? (y/N):${white} " yn case "${yn}" in Y|y|Yes|yes) select_msg "Yes" @@ -196,7 +196,7 @@ function download_mainsail() { ### check for moonraker multi-instance and if no-instance or multi-instance was found, enable mainsails remoteMode services=$(moonraker_systemd) - if [[ ( -z "$services" ) || ( $(echo "${services}" | wc -w) -gt 1 ) ]]; then + if [[ ( -z "${services}" ) || ( $(echo "${services}" | wc -w) -gt 1 ) ]]; then enable_mainsail_remotemode fi }