h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Evgenii
2021-09-11 01:31:26 +03:00
parent 935f1bd910
commit 2ff8cd5589
4 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/status.sh
View File

@@ -591,5 +591,5 @@ ui_print_versions(){
compare_mainsail_versions compare_mainsail_versions
compare_fluidd_versions compare_fluidd_versions
compare_klipperscreen_versions compare_klipperscreen_versions
compare_MoonrakerTelegramBot compare_MoonrakerTelegramBot_versions
} }

6
scripts/ui/install_menu.sh
View File

@@ -12,10 +12,10 @@ install_ui(){
echo -e "| Klipper API: | Other: | " echo -e "| Klipper API: | Other: | "
echo -e "| 2) [Moonraker] | 6) [Duet Web Control] | " echo -e "| 2) [Moonraker] | 6) [Duet Web Control] | "
echo -e "| | 7) [OctoPrint] | " echo -e "| | 7) [OctoPrint] | "
echo -e "| Klipper Webinterface: | 9) [MoonrakerTelegramBot]| " echo -e "| Klipper Webinterface: | 8) [MoonrakerTelegramBot]| "
echo -e "| 3) [Mainsail] | | " echo -e "| 3) [Mainsail] | | "
echo -e "| 4) [Fluidd] | Webcam: | " echo -e "| 4) [Fluidd] | Webcam: | "
echo -e "| | 8) [MJPG-Streamer] | " echo -e "| | 9) [MJPG-Streamer] | "
quit_footer quit_footer
} }
@@ -39,6 +39,8 @@ install_menu(){
7) 7)
do_action "octoprint_setup_dialog" "install_ui";; do_action "octoprint_setup_dialog" "install_ui";;
8) 8)
do_action "install_MoonrakerTelegramBot" "install_ui";;
9)
do_action "install_mjpg-streamer" "install_ui";; do_action "install_mjpg-streamer" "install_ui";;
Q|q) Q|q)
clear; main_menu; break;; clear; main_menu; break;;

29
scripts/ui/remove_menu.sh
View File

@@ -2,21 +2,20 @@ remove_ui(){
top_border top_border
echo -e "| ${red}~~~~~~~~~~~~~~ [ Remove Menu ] ~~~~~~~~~~~~~~${default} | " echo -e "| ${red}~~~~~~~~~~~~~~ [ Remove Menu ] ~~~~~~~~~~~~~~${default} | "
hr hr
echo -e "| Directories which remain untouched: | " echo -e "| Directories which remain untouched: | "
echo -e "| --> Your printer configuration directory | " echo -e "| --> Your printer configuration directory | "
echo -e "| --> ~/kiauh-backups | " echo -e "| --> ~/kiauh-backups | "
echo -e "| You need remove them manually if you wish so. | " echo -e "| You need remove them manually if you wish so. | "
hr echo -e "| Firmware: | Touchscreen GUI: | "
echo -e "| Firmware: | Touchscreen GUI: | " echo -e "| 1) [Klipper] | 5) [KlipperScreen] | "
echo -e "| 1) [Klipper] | 5) [KlipperScreen] | " echo -e "| | | "
echo -e "| | | " echo -e "| Klipper API: | Other: | "
echo -e "| Klipper API: | Other: | " echo -e "| 2) [Moonraker] | 6) [Duet Web Control] | "
echo -e "| 2) [Moonraker] | 6) [Duet Web Control] | " echo -e "| | 7) [OctoPrint] | "
echo -e "| | 7) [OctoPrint] | " echo -e "| Klipper Webinterface: | 8) [NGINX] | "
echo -e "| Klipper Webinterface: | 8) [NGINX] | " echo -e "| 3) [Mainsail] | 9) [MJPG-Streamer] | "
echo -e "| 3) [Mainsail] | 9) [MJPG-Streamer] | " echo -e "| 4) [Fluidd] | 10) [MTelegramBot] | "
echo -e "| 4) [Fluidd] | 10) [MoonrakerTelegramBot] | " echo -e "| | | "
echo -e "| | | "
quit_footer quit_footer
} }

6
scripts/ui/update_menu.sh
View File

@@ -21,9 +21,9 @@ update_ui(){
echo -e "| Other: |---------------|--------------| " echo -e "| Other: |---------------|--------------| "
echo -e "| 6) [DWC2-for-Klipper] | $LOCAL_DWC2FK_COMMIT | $REMOTE_DWC2FK_COMMIT | " 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 "| 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 "| |------------------------------| "
echo -e "| 8) [System] | $DISPLAY_SYS_UPDATE | " echo -e "| 9) [System] | $DISPLAY_SYS_UPDATE | "
quit_footer quit_footer
} }
@@ -50,6 +50,8 @@ update_menu(){
7) 7)
do_action "update_dwc2" "update_ui";; do_action "update_dwc2" "update_ui";;
8) 8)
do_action "update_MoonrakerTelegramBot" "update_ui";;
9)
do_action "update_system" "update_ui";; do_action "update_system" "update_ui";;
a) a)
do_action "update_all" "update_ui";; do_action "update_all" "update_ui";;