From 08842465b2f35d4694c8f87eacf9d626d409c7e9 Mon Sep 17 00:00:00 2001 From: Kenneth Jiang Date: Mon, 25 Jul 2022 15:10:06 -0700 Subject: [PATCH] Changes to the KIAUH menu --- scripts/ui/install_menu.sh | 10 ++++++---- scripts/ui/remove_menu.sh | 5 ++++- scripts/ui/update_menu.sh | 3 ++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/ui/install_menu.sh b/scripts/ui/install_menu.sh index 4fdb771..0df0d3e 100755 --- a/scripts/ui/install_menu.sh +++ b/scripts/ui/install_menu.sh @@ -25,10 +25,10 @@ function install_ui() { echo -e "| | Other: |" echo -e "| Klipper Webinterface: | 7) [PrettyGCode] |" echo -e "| 3) [Mainsail] | 8) [Telegram Bot] |" - echo -e "| 4) [Fluidd] | |" - echo -e "| | Webcam Streamer: |" - echo -e "| Touchscreen GUI: | 9) [MJPG-Streamer] |" - echo -e "| 5) [KlipperScreen] | |" + echo -e "| 4) [Fluidd] | 9) [Obico for Klipper] |" + echo -e "| | |" + echo -e "| Touchscreen GUI: | Webcam Streamer: |" + echo -e "| 5) [KlipperScreen] | 10) [MJPG-Streamer] |" back_footer } @@ -57,6 +57,8 @@ function install_menu() { 8) do_action "telegram_bot_setup_dialog" "install_ui";; 9) + do_action "moonraker_obico_setup_dialog" "install_ui";; + 10) do_action "install_mjpg-streamer" "install_ui";; B|b) clear; main_menu; break;; diff --git a/scripts/ui/remove_menu.sh b/scripts/ui/remove_menu.sh index b58d2f9..4cf743d 100755 --- a/scripts/ui/remove_menu.sh +++ b/scripts/ui/remove_menu.sh @@ -26,7 +26,8 @@ function remove_ui() { echo -e "| 4) [Fluidd] | Other: |" echo -e "| | 8) [PrettyGCode] |" echo -e "| Touchscreen GUI: | 9) [Telegram Bot] |" - echo -e "| 5) [KlipperScreen] | 10) [NGINX] |" + echo -e "| 5) [KlipperScreen] | 10) [Obico for Klipper] |" + echo -e "| | 11) [NGINX] |" back_footer } @@ -56,6 +57,8 @@ function remove_menu() { 9) do_action "remove_telegram_bot" "remove_ui";; 10) + do_action "remove_moonraker_obico" "remove_ui";; + 11) do_action "remove_nginx" "remove_ui";; B|b) clear; main_menu; break;; diff --git a/scripts/ui/update_menu.sh b/scripts/ui/update_menu.sh index 3d6338d..ea48024 100755 --- a/scripts/ui/update_menu.sh +++ b/scripts/ui/update_menu.sh @@ -31,8 +31,9 @@ function update_ui() { echo -e "| Other: |---------------|--------------|" echo -e "| 6) [PrettyGCode] |$(compare_prettygcode_versions)|" echo -e "| 7) [Telegram Bot] |$(compare_telegram_bot_versions)|" + echo -e "| 8) [Obico for Klipper]|$(compare_moonraker_obico_versions)|" echo -e "| |------------------------------|" - echo -e "| 8) [System] | $(check_system_updates) |" + echo -e "| 9) [System] | $(check_system_updates) |" back_footer }