refact(menu): moved spoolman option under "other"

This commit is contained in:
Alessandro Maggi
2024-06-23 18:22:52 +02:00
parent 336f557048
commit 8204c1bc05
4 changed files with 73 additions and 77 deletions

View File

@@ -17,18 +17,16 @@ function backup_ui() {
hr
echo -e "| ${yellow}INFO: Backups are located in '~/kiauh-backups'${white} |"
hr
echo -e "| Klipper & API: | Spool Manager: |"
echo -e "| 1) [Klipper] | 8) [Spoolman] |"
echo -e "| Klipper & API: | Touchscreen GUI: |"
echo -e "| 1) [Klipper] | 7) [KlipperScreen] |"
echo -e "| 2) [Moonraker] | |"
echo -e "| 3) [Config Folder] | 3rd Party Webinterface: |"
echo -e "| 4) [Moonraker Database] | 9) [OctoPrint] |"
echo -e "| 4) [Moonraker Database] | 8) [OctoPrint] |"
echo -e "| | |"
echo -e "| Klipper Webinterface: | Other: |"
echo -e "| 5) [Mainsail] | 10) [Telegram Bot] |"
echo -e "| 6) [Fluidd] | 11) [OctoEverywhere] |"
echo -e "| | |"
echo -e "| Touchscreen GUI: | |"
echo -e "| 7) [KlipperScreen] | |"
echo -e "| 5) [Mainsail] | 9) [Telegram Bot] |"
echo -e "| 6) [Fluidd] | 10) [OctoEverywhere] |"
echo -e "| | 11) [Spoolman] |"
back_footer
}
@@ -54,13 +52,13 @@ function backup_menu() {
7)
do_action "backup_klipperscreen" "backup_ui";;
8)
do_action "backup_spoolman" "backup_ui";;
9)
do_action "backup_octoprint" "backup_ui";;
10)
9)
do_action "backup_telegram_bot" "backup_ui";;
11)
10)
do_action "backup_octoeverywhere" "backup_ui";;
11)
do_action "backup_spoolman" "backup_ui";;
B|b)
clear; main_menu; break;;
*)

View File

@@ -19,19 +19,19 @@ function install_ui() {
echo -e "| all necessary dependencies for the various |"
echo -e "| functions on a completely fresh system. |"
hr
echo -e "| Firmware & API: | 3rd Party Webinterface: |"
echo -e "| 1) [Klipper] | 7) [OctoPrint] |"
echo -e "| 2) [Moonraker] | |"
echo -e "| | Other: |"
echo -e "| Klipper Webinterface: | 8) [PrettyGCode] |"
echo -e "| 3) [Mainsail] | 9) [Telegram Bot] |"
echo -e "| 4) [Fluidd] | 10) $(obico_install_title) |"
echo -e "| | 11) [OctoEverywhere] |"
echo -e "| Touchscreen GUI: | 12) [Mobileraker] |"
echo -e "| 5) [KlipperScreen] | 13) [OctoApp for Klipper] |"
echo -e "| | |"
echo -e "| Spool Manager: | Webcam Streamer: |"
echo -e "| 6) [Spoolman] | 14) [Crowsnest] |"
echo -e "| Firmware & API: | Other: |"
echo -e "| 1) [Klipper] | 7) [PrettyGCode] |"
echo -e "| 2) [Moonraker] | 8) [Telegram Bot] |"
echo -e "| | 9) $(obico_install_title) |"
echo -e "| Klipper Webinterface: | 10) [OctoEverywhere] |"
echo -e "| 3) [Mainsail] | 11) [Mobileraker] |"
echo -e "| 4) [Fluidd] | 12) [OctoApp for Klipper] |"
echo -e "| | 13) [Spoolman] |"
echo -e "| Touchscreen GUI: | |"
echo -e "| 5) [KlipperScreen] | Webcam Streamer: |"
echo -e "| | 14) [Crowsnest] |"
echo -e "| 3rd Party Webinterface: | |"
echo -e "| 6) [OctoPrint] | |"
back_footer
}
@@ -61,21 +61,21 @@ function install_menu() {
5)
do_action "install_klipperscreen" "install_ui";;
6)
do_action "install_spoolman" "install_ui";;
7)
do_action "octoprint_setup_dialog" "install_ui";;
8)
7)
do_action "install_pgc_for_klipper" "install_ui";;
9)
8)
do_action "telegram_bot_setup_dialog" "install_ui";;
10)
9)
do_action "moonraker_obico_setup_dialog" "install_ui";;
11)
10)
do_action "octoeverywhere_setup_dialog" "install_ui";;
12)
11)
do_action "install_mobileraker" "install_ui";;
13)
12)
do_action "octoapp_setup_dialog" "install_ui";;
13)
do_action "install_spoolman" "install_ui";;
14)
do_action "install_crowsnest" "install_ui";;
B|b)

View File

@@ -17,21 +17,21 @@ function remove_ui() {
hr
echo -e "| ${yellow}INFO: Configurations and/or any backups will be kept!${white} |"
hr
echo -e "| Firmware & API: | 3rd Party Webinterface: |"
echo -e "| 1) [Klipper] | 9) [OctoPrint] |"
echo -e "| 2) [Moonraker] | |"
echo -e "| | Webcam Streamer: |"
echo -e "| Klipper Webinterface: | 10) [Crowsnest] |"
echo -e "| 3) [Mainsail] | 11) [MJPG-Streamer] |"
echo -e "| 4) [Mainsail-Config] | |"
echo -e "| 5) [Fluidd] | Other: |"
echo -e "| 6) [Fluidd-Config] | 12) [PrettyGCode] |"
echo -e "| | 13) [Telegram Bot] |"
echo -e "| Touchscreen GUI: | 14) [Obico for Klipper] |"
echo -e "| 7) [KlipperScreen] | 15) [OctoEverywhere] |"
echo -e "| | 16) [Mobileraker] |"
echo -e "| Spool Manager: | 17) [NGINX] |"
echo -e "| 8) [Spoolman] | 18) [OctoApp] |"
echo -e "| Firmware & API: | Webcam Streamer: |"
echo -e "| 1) [Klipper] | 9) [Crowsnest] |"
echo -e "| 2) [Moonraker] | 10) [MJPG-Streamer] |"
echo -e "| | |"
echo -e "| Klipper Webinterface: | Other: |"
echo -e "| 3) [Mainsail] | 11) [PrettyGCode] |"
echo -e "| 4) [Mainsail-Config] | 12) [Telegram Bot] |"
echo -e "| 5) [Fluidd] | 13) [Obico for Klipper] |"
echo -e "| 6) [Fluidd-Config] | 14) [OctoEverywhere] |"
echo -e "| | 15) [Mobileraker] |"
echo -e "| Touchscreen GUI: | 16) [NGINX] |"
echo -e "| 7) [KlipperScreen] | 17) [OctoApp] |"
echo -e "| | 18) [Spoolman] |"
echo -e "| 3rd Party Webinterface: | |"
echo -e "| 8) [OctoPrint] | |"
back_footer
}
@@ -57,27 +57,27 @@ function remove_menu() {
7)
do_action "remove_klipperscreen" "remove_ui";;
8)
do_action "remove_spoolman" "remove_ui";;
9)
do_action "remove_octoprint" "remove_ui";;
10)
9)
do_action "remove_crowsnest" "remove_ui";;
11)
10)
do_action "remove_mjpg-streamer" "remove_ui";;
12)
11)
do_action "remove_prettygcode" "remove_ui";;
13)
12)
do_action "remove_telegram_bot" "remove_ui";;
14)
13)
do_action "remove_moonraker_obico" "remove_ui";;
15)
14)
do_action "remove_octoeverywhere" "remove_ui";;
16)
15)
do_action "remove_mobileraker" "remove_ui";;
17)
16)
do_action "remove_nginx" "remove_ui";;
18)
17)
do_action "remove_octoapp" "remove_ui";;
18)
do_action "remove_spoolman" "remove_ui";;
B|b)
clear; main_menu; break;;
*)

View File

@@ -28,17 +28,15 @@ function update_ui() {
echo -e "| Touchscreen GUI: |---------------|--------------|"
echo -e "| 5) [KlipperScreen] |$(compare_klipperscreen_versions)|"
echo -e "| | | |"
echo -e "| Spool Manager: |---------------|--------------|"
echo -e "| 6) [Spoolman] |$(compare_spoolman_versions)|"
echo -e "| | | |"
echo -e "| Other: |---------------|--------------|"
echo -e "| 7) [PrettyGCode] |$(compare_prettygcode_versions)|"
echo -e "| 8) [Telegram Bot] |$(compare_telegram_bot_versions)|"
echo -e "| 9) [Obico for Klipper]|$(compare_moonraker_obico_versions)|"
echo -e "| 10) [OctoEverywhere] |$(compare_octoeverywhere_versions)|"
echo -e "| 11) [Mobileraker] |$(compare_mobileraker_versions)|"
echo -e "| 12) [Crowsnest] |$(compare_crowsnest_versions)|"
echo -e "| 13) [OctoApp] |$(compare_octoapp_versions)|"
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 "| 9) [OctoEverywhere] |$(compare_octoeverywhere_versions)|"
echo -e "| 10) [Mobileraker] |$(compare_mobileraker_versions)|"
echo -e "| 11) [Crowsnest] |$(compare_crowsnest_versions)|"
echo -e "| 12) [OctoApp] |$(compare_octoapp_versions)|"
echo -e "| 13) [Spoolman] |$(compare_spoolman_versions)|"
echo -e "| |------------------------------|"
echo -e "| 14) [System] | $(check_system_updates) |"
back_footer
@@ -65,21 +63,21 @@ function update_menu() {
5)
do_action "update_klipperscreen" "update_ui";;
6)
do_action "update_spoolman" "update_ui";;
7)
do_action "update_pgc_for_klipper" "update_ui";;
8)
7)
do_action "update_telegram_bot" "update_ui";;
9)
8)
do_action "update_moonraker_obico" "update_ui";;
10)
9)
do_action "update_octoeverywhere" "update_ui";;
11)
10)
do_action "update_mobileraker" "update_ui";;
12)
11)
do_action "update_crowsnest" "update_ui";;
13)
12)
do_action "update_octoapp" "update_ui";;
13)
do_action "update_spoolman" "update_ui";;
14)
do_action "upgrade_system_packages" "update_ui";;
a)