From 9b57f71862d3e02d484671d5a10ba3c557bfcf85 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Wed, 19 Oct 2022 23:09:24 +0200 Subject: [PATCH] refactor: disable installers for components that currently can't be updated in a timely manner Signed-off-by: Dominik Willner --- kiauh.sh | 7 ++++++ scripts/fluidd.sh | 48 +++++++++++++++++++------------------- scripts/mainsail.sh | 48 +++++++++++++++++++------------------- scripts/ui/install_menu.sh | 30 +++++++++++++++++++----- scripts/ui/main_menu.sh | 9 +++++++ 5 files changed, 88 insertions(+), 54 deletions(-) diff --git a/kiauh.sh b/kiauh.sh index b01b5d9..0e069af 100755 --- a/kiauh.sh +++ b/kiauh.sh @@ -9,6 +9,13 @@ # This file may be distributed under the terms of the GNU GPLv3 license # #=======================================================================# +# TODO: mjpg-streamer +# TODO: moonraker-telegram-bot +# TODO: obico +# TODO: pretty_gcode +# TODO: upload_log +# TODO: doublecheck that nothing got missed! + set -e clear diff --git a/scripts/fluidd.sh b/scripts/fluidd.sh index 2aa7a62..661c2ce 100644 --- a/scripts/fluidd.sh +++ b/scripts/fluidd.sh @@ -39,29 +39,29 @@ function install_fluidd() { ### check if another site already listens to port 80 fluidd_port_check - ### ask user to install mjpg-streamer - local install_mjpg_streamer - if [[ ! -f "${SYSTEMD}/webcamd.service" ]]; then - while true; do - echo - top_border - echo -e "| Install MJPG-Streamer for webcam support? |" - bottom_border - read -p "${cyan}###### Please select (y/N):${white} " yn - case "${yn}" in - Y|y|Yes|yes) - select_msg "Yes" - install_mjpg_streamer="true" - break;; - N|n|No|no|"") - select_msg "No" - install_mjpg_streamer="false" - break;; - *) - error_msg "Invalid command!";; - esac - done - fi +# ### ask user to install mjpg-streamer +# local install_mjpg_streamer +# if [[ ! -f "${SYSTEMD}/webcamd.service" ]]; then +# while true; do +# echo +# top_border +# echo -e "| Install MJPG-Streamer for webcam support? |" +# bottom_border +# read -p "${cyan}###### Please select (y/N):${white} " yn +# case "${yn}" in +# Y|y|Yes|yes) +# select_msg "Yes" +# install_mjpg_streamer="true" +# break;; +# N|n|No|no|"") +# select_msg "No" +# install_mjpg_streamer="false" +# break;; +# *) +# error_msg "Invalid command!";; +# esac +# done +# fi ### download fluidd download_fluidd @@ -83,7 +83,7 @@ function install_fluidd() { patch_fluidd_update_manager ### install mjpg-streamer - [[ ${install_mjpg_streamer} == "true" ]] && install_mjpg-streamer +# [[ ${install_mjpg_streamer} == "true" ]] && install_mjpg-streamer fetch_webui_ports #WIP diff --git a/scripts/mainsail.sh b/scripts/mainsail.sh index 88208b6..4e8bc9f 100644 --- a/scripts/mainsail.sh +++ b/scripts/mainsail.sh @@ -39,29 +39,29 @@ function install_mainsail() { ### check if another site already listens to port 80 mainsail_port_check - ### ask user to install mjpg-streamer - local install_mjpg_streamer - if [[ ! -f "${SYSTEMD}/webcamd.service" ]]; then - while true; do - echo - top_border - echo -e "| Install MJPG-Streamer for webcam support? |" - bottom_border - read -p "${cyan}###### Please select (y/N):${white} " yn - case "${yn}" in - Y|y|Yes|yes) - select_msg "Yes" - install_mjpg_streamer="true" - break;; - N|n|No|no|"") - select_msg "No" - install_mjpg_streamer="false" - break;; - *) - error_msg "Invalid command!";; - esac - done - fi +# ### ask user to install mjpg-streamer +# local install_mjpg_streamer +# if [[ ! -f "${SYSTEMD}/webcamd.service" ]]; then +# while true; do +# echo +# top_border +# echo -e "| Install MJPG-Streamer for webcam support? |" +# bottom_border +# read -p "${cyan}###### Please select (y/N):${white} " yn +# case "${yn}" in +# Y|y|Yes|yes) +# select_msg "Yes" +# install_mjpg_streamer="true" +# break;; +# N|n|No|no|"") +# select_msg "No" +# install_mjpg_streamer="false" +# break;; +# *) +# error_msg "Invalid command!";; +# esac +# done +# fi ### download mainsail download_mainsail @@ -83,7 +83,7 @@ function install_mainsail() { patch_mainsail_update_manager ### install mjpg-streamer - [[ ${install_mjpg_streamer} == "true" ]] && install_mjpg-streamer +# [[ ${install_mjpg_streamer} == "true" ]] && install_mjpg-streamer fetch_webui_ports #WIP diff --git a/scripts/ui/install_menu.sh b/scripts/ui/install_menu.sh index 9f60e7f..e3ef00b 100755 --- a/scripts/ui/install_menu.sh +++ b/scripts/ui/install_menu.sh @@ -55,17 +55,35 @@ function install_menu() { 4) do_action "install_fluidd" "install_ui";; 5) - do_action "install_klipperscreen" "install_ui";; + #do_action "install_klipperscreen" "install_ui";; + clear && print_header + print_error "Function currently disabled! Sorry!" + install_ui;; 6) - do_action "octoprint_setup_dialog" "install_ui";; + #do_action "octoprint_setup_dialog" "install_ui";; + clear && print_header + print_error "Function currently disabled! Sorry!" + install_ui;; 7) - do_action "install_pgc_for_klipper" "install_ui";; + #do_action "install_pgc_for_klipper" "install_ui";; + clear && print_header + print_error "Function currently disabled! Sorry!" + install_ui;; 8) - do_action "telegram_bot_setup_dialog" "install_ui";; + #do_action "telegram_bot_setup_dialog" "install_ui";; + clear && print_header + print_error "Function currently disabled! Sorry!" + install_ui;; 9) - do_action "moonraker_obico_setup_dialog" "install_ui";; + #do_action "moonraker_obico_setup_dialog" "install_ui";; + clear && print_header + print_error "Function currently disabled! Sorry!" + install_ui;; 10) - do_action "install_mjpg-streamer" "install_ui";; + #do_action "install_mjpg-streamer" "install_ui";; + clear && print_header + print_error "Function currently disabled! Sorry!" + install_ui;; B|b) clear; main_menu; break;; *) diff --git a/scripts/ui/main_menu.sh b/scripts/ui/main_menu.sh index 925fca6..e19fb70 100755 --- a/scripts/ui/main_menu.sh +++ b/scripts/ui/main_menu.sh @@ -12,6 +12,15 @@ set -e function main_ui() { + echo -e "${yellow}/=======================================================\\" + echo -e "| Note: |" + echo -e "| Temporarily, installation of the following software |" + echo -e "| is disabled: KlipperScreen, OctoPrint, Obico, |" + echo -e "| PrettyGCode, Telegram Bot, MJPG-Streamer. |" + blank_line + echo -e "| They will be available again hopefully soon. |" + echo -e "| Sorry for the inconvenience! |" + echo -e "\=======================================================/${white}" top_border echo -e "| $(title_msg "~~~~~~~~~~~~~~~ [ Main Menu ] ~~~~~~~~~~~~~~~") |" hr