diff --git a/scripts/status.sh b/scripts/status.sh index 80e19d5..eba7b61 100755 --- a/scripts/status.sh +++ b/scripts/status.sh @@ -591,5 +591,5 @@ ui_print_versions(){ compare_mainsail_versions compare_fluidd_versions compare_klipperscreen_versions - compare_MoonrakerTelegramBot + compare_MoonrakerTelegramBot_versions } diff --git a/scripts/ui/install_menu.sh b/scripts/ui/install_menu.sh index 94e6f44..2ea5a56 100755 --- a/scripts/ui/install_menu.sh +++ b/scripts/ui/install_menu.sh @@ -12,10 +12,10 @@ install_ui(){ echo -e "| Klipper API: | Other: | " echo -e "| 2) [Moonraker] | 6) [Duet Web Control] | " echo -e "| | 7) [OctoPrint] | " - echo -e "| Klipper Webinterface: | 9) [MoonrakerTelegramBot]| " + echo -e "| Klipper Webinterface: | 8) [MoonrakerTelegramBot]| " echo -e "| 3) [Mainsail] | | " echo -e "| 4) [Fluidd] | Webcam: | " - echo -e "| | 8) [MJPG-Streamer] | " + echo -e "| | 9) [MJPG-Streamer] | " quit_footer } @@ -39,6 +39,8 @@ install_menu(){ 7) do_action "octoprint_setup_dialog" "install_ui";; 8) + do_action "install_MoonrakerTelegramBot" "install_ui";; + 9) do_action "install_mjpg-streamer" "install_ui";; Q|q) clear; main_menu; break;; diff --git a/scripts/ui/remove_menu.sh b/scripts/ui/remove_menu.sh index 169b608..8fcaf9e 100755 --- a/scripts/ui/remove_menu.sh +++ b/scripts/ui/remove_menu.sh @@ -2,21 +2,20 @@ remove_ui(){ top_border echo -e "| ${red}~~~~~~~~~~~~~~ [ Remove Menu ] ~~~~~~~~~~~~~~${default} | " hr - echo -e "| Directories which remain untouched: | " - echo -e "| --> Your printer configuration directory | " - echo -e "| --> ~/kiauh-backups | " - echo -e "| You need remove them manually if you wish so. | " - hr - echo -e "| Firmware: | Touchscreen GUI: | " - echo -e "| 1) [Klipper] | 5) [KlipperScreen] | " - echo -e "| | | " - echo -e "| Klipper API: | Other: | " - echo -e "| 2) [Moonraker] | 6) [Duet Web Control] | " - echo -e "| | 7) [OctoPrint] | " - echo -e "| Klipper Webinterface: | 8) [NGINX] | " - echo -e "| 3) [Mainsail] | 9) [MJPG-Streamer] | " - echo -e "| 4) [Fluidd] | 10) [MoonrakerTelegramBot] | " - echo -e "| | | " + echo -e "| Directories which remain untouched: | " + echo -e "| --> Your printer configuration directory | " + echo -e "| --> ~/kiauh-backups | " + echo -e "| You need remove them manually if you wish so. | " + echo -e "| Firmware: | Touchscreen GUI: | " + echo -e "| 1) [Klipper] | 5) [KlipperScreen] | " + echo -e "| | | " + echo -e "| Klipper API: | Other: | " + echo -e "| 2) [Moonraker] | 6) [Duet Web Control] | " + echo -e "| | 7) [OctoPrint] | " + echo -e "| Klipper Webinterface: | 8) [NGINX] | " + echo -e "| 3) [Mainsail] | 9) [MJPG-Streamer] | " + echo -e "| 4) [Fluidd] | 10) [MTelegramBot] | " + echo -e "| | | " quit_footer } diff --git a/scripts/ui/update_menu.sh b/scripts/ui/update_menu.sh index 289900f..2ec1b75 100755 --- a/scripts/ui/update_menu.sh +++ b/scripts/ui/update_menu.sh @@ -21,9 +21,9 @@ update_ui(){ echo -e "| Other: |---------------|--------------| " echo -e "| 6) [DWC2-for-Klipper] | $LOCAL_DWC2FK_COMMIT | $REMOTE_DWC2FK_COMMIT | " echo -e "| 7) [DWC2 Web UI] | $DWC2_LOCAL_VER | $DWC2_REMOTE_VER | " - echo -e "| 5) [MTelegramBot] | $LOCAL_MOONRAKERTELEGRAMBOT_COMMIT | $REMOTE_MOONRAKERTELEGRAMBOT_COMMIT | " + echo -e "| 8) [MTelegramBot] | $LOCAL_MOONRAKERTELEGRAMBOT_COMMIT | $REMOTE_MOONRAKERTELEGRAMBOT_COMMIT | " echo -e "| |------------------------------| " - echo -e "| 8) [System] | $DISPLAY_SYS_UPDATE | " + echo -e "| 9) [System] | $DISPLAY_SYS_UPDATE | " quit_footer } @@ -50,6 +50,8 @@ update_menu(){ 7) do_action "update_dwc2" "update_ui";; 8) + do_action "update_MoonrakerTelegramBot" "update_ui";; + 9) do_action "update_system" "update_ui";; a) do_action "update_all" "update_ui";;