From e71f1b9dfd58132562424c67de9cec592a77a83d Mon Sep 17 00:00:00 2001
From: th33xitus <th33xitus@googlemail.com>
Date: Sun, 17 Jan 2021 14:44:10 +0100
Subject: [PATCH] fix: refactor install_menu

---
 scripts/ui/install_menu.sh | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/scripts/ui/install_menu.sh b/scripts/ui/install_menu.sh
index 2acfede..074479f 100755
--- a/scripts/ui/install_menu.sh
+++ b/scripts/ui/install_menu.sh
@@ -6,14 +6,16 @@ install_ui(){
   echo -e "|  all necessary dependencies for the various           | "
   echo -e "|  functions on a completely fresh system.              | "
   hr
-  echo -e "|  Firmware:             |  Webinterface:               | "
-  echo -e "|  1) [Klipper]          |  3) [DWC2]                   | "
-  echo -e "|                        |  4) [Mainsail]               | "
-  echo -e "|  Klipper API:          |  5) [Fluidd]                 | "
-  echo -e "|  2) [Moonraker]        |  6) [Octoprint]              | "
+  echo -e "|  Firmware:             |  Klipper Webinterface:       | "
+  echo -e "|  1) [Klipper]          |  3) [Mainsail]               | "
+  echo -e "|                        |  4) [Fluidd]                 | "
+  echo -e "|  Klipper API:          |                              | "
+  echo -e "|  2) [Moonraker]        |  HDMI Screen:                | "
+  echo -e "|                        |  5) [KlipperScreen]          | "
   echo -e "|                        |                              | "
-  echo -e "|                        |  HDMI Screen:                | "
-  echo -e "|                        |  7) [KlipperScreen]          | "
+  echo -e "|                        |  Other:                      | "
+  echo -e "|                        |  6) [Duet Web Control]       | "
+  echo -e "|                        |  7) [OctoPrint]              | "
   quit_footer
 }
 
@@ -38,31 +40,31 @@ install_menu(){
       3)
         clear
         print_header
-        install_dwc2
+        install_mainsail
         print_msg && clear_msg
         install_ui;;
       4)
         clear
         print_header
-        install_mainsail
+        install_fluidd
         print_msg && clear_msg
         install_ui;;
       5)
         clear
         print_header
-        install_fluidd
+        install_klipperscreen
         print_msg && clear_msg
         install_ui;;
       6)
         clear
         print_header
-        install_octoprint
+        install_dwc2
         print_msg && clear_msg
         install_ui;;
       7)
         clear
         print_header
-        install_klipperscreen
+        install_octoprint
         print_msg && clear_msg
         install_ui;;
       Q|q)